mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-27 03:20:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

(almost) blind fixes to ITS#4782

Browse Source
This commit is contained in:
Pierangelo Masarati 2006-12-19 21:59:23 +00:00
parent 08b209ffa9
commit 6752a27c0e
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
servers/slapd/back-ldap/bind.c
View File

@ -704,7 +704,10 @@ ldap_back_getconn(
op->o_dn = op->o_req_dn; op->o_dn = op->o_req_dn;
op->o_ndn = op->o_req_ndn; op->o_ndn = op->o_req_ndn;
} }
isproxyauthz = ldap_back_is_proxy_authz( op, rs, 0, binddn, bindcred ); isproxyauthz = ldap_back_is_proxy_authz( op, rs, sendok, binddn, bindcred );
if ( isproxyauthz == -1 ) {
return NULL;
}
if ( op->o_tag == LDAP_REQ_BIND ) { if ( op->o_tag == LDAP_REQ_BIND ) {
op->o_dn = save_o_dn; op->o_dn = save_o_dn;
op->o_ndn = save_o_ndn; op->o_ndn = save_o_ndn;
@ -1154,7 +1157,9 @@ retry_lock:;
*/ */
if ( LDAP_BACK_CONN_ISIDASSERT( lc ) ) { if ( LDAP_BACK_CONN_ISIDASSERT( lc ) ) {
if ( BER_BVISEMPTY( &binddn ) && BER_BVISEMPTY( &bindcred ) ) { if ( BER_BVISEMPTY( &binddn ) && BER_BVISEMPTY( &bindcred ) ) {
ldap_back_is_proxy_authz( op, rs, 0, &binddn, &bindcred ); /* if we got here, it shouldn't return result */
(void)ldap_back_is_proxy_authz( op, rs,
LDAP_BACK_DONTSEND, &binddn, &bindcred );
} }
(void)ldap_back_proxy_authz_bind( lc, op, rs, sendok, &binddn, &bindcred ); (void)ldap_back_proxy_authz_bind( lc, op, rs, sendok, &binddn, &bindcred );
goto done; goto done;
@ -1706,6 +1711,7 @@ ldap_back_is_proxy_authz( Operation *op, SlapReply *rs, ldap_back_send_t sendok,
rs->sr_err = LDAP_UNWILLING_TO_PERFORM; rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
if ( sendok & LDAP_BACK_SENDERR ) { if ( sendok & LDAP_BACK_SENDERR ) {
send_ldap_result( op, rs ); send_ldap_result( op, rs );
dobind = -1;
} }
goto done; goto done;
} }
@ -1740,6 +1746,7 @@ ldap_back_is_proxy_authz( Operation *op, SlapReply *rs, ldap_back_send_t sendok,
rs->sr_err = LDAP_INAPPROPRIATE_AUTH; rs->sr_err = LDAP_INAPPROPRIATE_AUTH;
if ( sendok & LDAP_BACK_SENDERR ) { if ( sendok & LDAP_BACK_SENDERR ) {
send_ldap_result( op, rs ); send_ldap_result( op, rs );
dobind = -1;
} }
} else { } else {
@ -1766,6 +1773,7 @@ ldap_back_is_proxy_authz( Operation *op, SlapReply *rs, ldap_back_send_t sendok,
if ( li->li_idassert_flags & LDAP_BACK_AUTH_PRESCRIPTIVE ) { if ( li->li_idassert_flags & LDAP_BACK_AUTH_PRESCRIPTIVE ) {
if ( sendok & LDAP_BACK_SENDERR ) { if ( sendok & LDAP_BACK_SENDERR ) {
send_ldap_result( op, rs ); send_ldap_result( op, rs );
dobind = -1;
} }
} else { } else {

4
servers/slapd/back-ldap/init.c
View File

@ -152,6 +152,10 @@ ldap_back_db_init( Backend *be )
be->be_cf_ocs = be->bd_info->bi_cf_ocs; be->be_cf_ocs = be->bd_info->bi_cf_ocs;
rc = ldap_back_monitor_db_init( be ); rc = ldap_back_monitor_db_init( be );
if ( rc != 0 ) {
/* ignore, by now */
rc = 0;
}
return rc; return rc;
} }