mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-30 13:30:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#6711 minimal tweaks for aclbind/idassertbind for privileged connection

Browse Source 
in dobind_int().
This commit is contained in:
Howard Chu 2011-02-02 20:56:58 +00:00
parent d626977848
commit e72c093a55
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1404,28 +1404,33 @@ retry_lock:;
}
#ifdef HAVE_CYRUS_SASL
if ( LDAP_BACK_CONN_ISPRIV( lc )
&& li->li_acl_authmethod == LDAP_AUTH_SASL )
{
if ( LDAP_BACK_CONN_ISPRIV( lc )) {
slap_bindconf *sb;
if ( li->li_acl_authmethod != LDAP_AUTH_NONE )
sb = &li->li_acl;
else
sb = &li->li_idassert.si_bc;
if ( sb->sb_method == LDAP_AUTH_SASL ) {
void *defaults = NULL;
if ( li->li_acl_secprops != NULL ) {
if ( sb->sb_secprops != NULL ) {
rc = ldap_set_option( lc->lc_ld,
LDAP_OPT_X_SASL_SECPROPS, li->li_acl_secprops );
LDAP_OPT_X_SASL_SECPROPS, sb->sb_secprops );
if ( rc != LDAP_OPT_SUCCESS ) {
Debug( LDAP_DEBUG_ANY, "Error: ldap_set_option "
"(SECPROPS,\"%s\") failed!\n",
li->li_acl_secprops, 0, 0 );
sb->sb_secprops, 0, 0 );
goto done;
}
}
defaults = lutil_sasl_defaults( lc->lc_ld,
li->li_acl_sasl_mech.bv_val,
li->li_acl_sasl_realm.bv_val,
li->li_acl_authcID.bv_val,
li->li_acl_passwd.bv_val,
sb->sb_saslmech.bv_val,
sb->sb_realm.bv_val,
sb->sb_authcId.bv_val,
sb->sb_cred.bv_val,
NULL );
if ( defaults == NULL ) {
rs->sr_err = LDAP_OTHER;
@ -1437,8 +1442,8 @@ retry_lock:;
}
rs->sr_err = ldap_sasl_interactive_bind_s( lc->lc_ld,
li->li_acl_authcDN.bv_val,
li->li_acl_sasl_mech.bv_val, NULL, NULL,
sb->sb_binddn.bv_val,
sb->sb_saslmech.bv_val, NULL, NULL,
LDAP_SASL_QUIET, lutil_sasl_interact,
defaults );
@ -1472,6 +1477,7 @@ retry_lock:;
goto done;
}
}
#endif /* HAVE_CYRUS_SASL */
retry:;