mirror of
https://git.openldap.org/openldap/openldap.git
synced 2024-12-15 03:01:09 +08:00
correct callback numbering
This commit is contained in:
parent
17527368d1
commit
5701fec1b5
@ -825,21 +825,27 @@ ldap_negotiated_sasl_bind_s(
|
|||||||
LDAPControl **serverControls,
|
LDAPControl **serverControls,
|
||||||
LDAPControl **clientControls)
|
LDAPControl **clientControls)
|
||||||
{
|
{
|
||||||
|
int n;
|
||||||
sasl_callback_t callbacks[4];
|
sasl_callback_t callbacks[4];
|
||||||
int rc;
|
int rc;
|
||||||
|
|
||||||
callbacks[0].id = SASL_CB_USER;
|
callbacks[n=0].id = SASL_CB_USER;
|
||||||
callbacks[0].proc = ldap_pvt_sasl_getsimple;
|
callbacks[n].proc = ldap_pvt_sasl_getsimple;
|
||||||
callbacks[1].context = (void *)authenticationId;
|
callbacks[n].context = (void *)authenticationId;
|
||||||
callbacks[1].id = SASL_CB_AUTHNAME;
|
|
||||||
callbacks[1].proc = ldap_pvt_sasl_getsimple;
|
if( authorizationId != NULL ) {
|
||||||
callbacks[0].context = (void *)authorizationId;
|
callbacks[++n].id = SASL_CB_AUTHNAME;
|
||||||
callbacks[2].id = SASL_CB_PASS;
|
callbacks[n].proc = ldap_pvt_sasl_getsimple;
|
||||||
callbacks[2].proc = ldap_pvt_sasl_getsecret;
|
callbacks[n].context = (void *)authorizationId;
|
||||||
callbacks[2].context = (void *)passPhrase;
|
}
|
||||||
callbacks[3].id = SASL_CB_LIST_END;
|
|
||||||
callbacks[3].proc = NULL;
|
callbacks[++n].id = SASL_CB_PASS;
|
||||||
callbacks[3].context = NULL;
|
callbacks[n].proc = ldap_pvt_sasl_getsecret;
|
||||||
|
callbacks[n].context = (void *)passPhrase;
|
||||||
|
|
||||||
|
callbacks[++n].id = SASL_CB_LIST_END;
|
||||||
|
callbacks[n].proc = NULL;
|
||||||
|
callbacks[n].context = NULL;
|
||||||
|
|
||||||
rc = ldap_pvt_sasl_bind(ld, dn, saslMechanism, callbacks,
|
rc = ldap_pvt_sasl_bind(ld, dn, saslMechanism, callbacks,
|
||||||
serverControls, clientControls);
|
serverControls, clientControls);
|
||||||
|
Loading…
Reference in New Issue
Block a user