mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix previous commit

Browse Source
This commit is contained in:
Pierangelo Masarati 2010-04-12 00:06:45 +00:00
parent 5812265a84
commit 0dc3a13c01
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
servers/slapd/back-ldap/chain.c
View File

@ -854,6 +854,7 @@ ldap_chain_response( Operation *op, SlapReply *rs )
/* we need this to know if back-ldap returned any result */
lb.lb_lc = lc;
sc2.sc_next = sc->sc_next;
sc2.sc_private = &lb;
sc2.sc_response = ldap_chain_cb_response;
op->o_callback = &sc2;
@ -947,6 +948,7 @@ ldap_chain_response( Operation *op, SlapReply *rs )
case LDAP_SUCCESS:
case LDAP_REFERRAL:
sr_err = rs->sr_err;
/* slapd-ldap sent response */
if ( !op->o_abandon && lb.lb_status != LDAP_CH_RES ) {
/* FIXME: should we send response? */

16
servers/slapd/back-ldap/config.c
View File

@ -689,9 +689,11 @@ slap_idassert_authzfrom_parse( ConfigArgs *c, slap_idassert_t *si )
ber_bvarray_add( &si->si_authz, &bv );
} else {
int i;
for ( i = 0; !BER_BVISNULL( &si->si_authz[ i ] ); i++ )
;
int i = 0;
if ( si->si_authz != NULL ) {
for ( ; !BER_BVISNULL( &si->si_authz[ i ] ); i++ )
;
}
if ( i <= c->valx ) {
ber_bvarray_add( &si->si_authz, &bv );
@ -734,9 +736,11 @@ slap_idassert_passthru_parse( ConfigArgs *c, slap_idassert_t *si )
ber_bvarray_add( &si->si_passthru, &bv );
} else {
int i;
for ( i = 0; !BER_BVISNULL( &si->si_passthru[ i ] ); i++ )
;
int i = 0;
if ( si->si_passthru != NULL ) {
for ( ; !BER_BVISNULL( &si->si_passthru[ i ] ); i++ )
;
}
if ( i <= c->valx ) {
ber_bvarray_add( &si->si_passthru, &bv );