diff options
| author | Noriko Hosoi <nhosoi@redhat.com> | 2010-03-05 16:09:28 -0800 |
|---|---|---|
| committer | Noriko Hosoi <nhosoi@redhat.com> | 2010-03-05 16:09:28 -0800 |
| commit | 031e725dce895bf2382ca7801cef772fe6b24c61 (patch) | |
| tree | 82cab73fc5a8326f0f4e5bd5869f154895b98532 /ldap/servers/slapd/bind.c | |
| parent | f2a04fdc45cc8a408267019990504354282c4303 (diff) | |
| download | ds-031e725dce895bf2382ca7801cef772fe6b24c61.tar.gz ds-031e725dce895bf2382ca7801cef772fe6b24c61.tar.xz ds-031e725dce895bf2382ca7801cef772fe6b24c61.zip | |
Revert "Merge branch '547503'"
This reverts commit f2a04fdc45cc8a408267019990504354282c4303, reversing
changes made to 0b95451c7e50cb6b2d0cb310dddca18336e1b2ac.
Diffstat (limited to 'ldap/servers/slapd/bind.c')
| -rw-r--r-- | ldap/servers/slapd/bind.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/ldap/servers/slapd/bind.c b/ldap/servers/slapd/bind.c index d3e90091..3458ff66 100644 --- a/ldap/servers/slapd/bind.c +++ b/ldap/servers/slapd/bind.c @@ -305,8 +305,7 @@ do_bind( Slapi_PBlock *pb ) switch ( version ) { case LDAP_VERSION2: if (method == LDAP_AUTH_SIMPLE - && (config_get_force_sasl_external() || - ((dn == NULL || *dn == '\0') && cred.bv_len == 0)) + && (dn == NULL || *dn == '\0') && cred.bv_len == 0 && pb->pb_conn->c_external_dn != NULL) { /* Treat this like a SASL EXTERNAL Bind: */ method = LDAP_AUTH_SASL; @@ -318,17 +317,6 @@ do_bind( Slapi_PBlock *pb ) } break; case LDAP_VERSION3: - if ((method == LDAP_AUTH_SIMPLE) && - config_get_force_sasl_external() && - (pb->pb_conn->c_external_dn != NULL)) { - /* Treat this like a SASL EXTERNAL Bind: */ - method = LDAP_AUTH_SASL; - saslmech = slapi_ch_strdup (LDAP_SASL_EXTERNAL); - /* This enables a client to establish an identity by sending - * a certificate in the SSL handshake, and also use LDAPv2 - * (by sending this type of Bind request). - */ - } break; default: LDAPDebug( LDAP_DEBUG_TRACE, "bind: unknown LDAP protocol version %d\n", |