X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fsaslauthz.c;h=dca9a0eb15c37e2f116a571c8dd266b9a7e239f3;hb=f3648ea812ea7327e88217cdeb8def360aa012ad;hp=d38ad64079a38f7b49caa59cf05c2be89696596b;hpb=a0f646860d698ca8d535660e650c840e3c71b2c2;p=openldap

diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c
index d38ad64079..dca9a0eb15 100644
--- a/servers/slapd/saslauthz.c
+++ b/servers/slapd/saslauthz.c
@@ -633,9 +633,7 @@ int slap_sasl_match( Operation *opx, struct berval *rule,
 		&op.ors_filterstr );
 	if( rc != LDAP_SUCCESS ) goto CONCLUDED;
 
-	/* Massive shortcut: search scope == base */
 	switch ( op.oq_search.rs_scope ) {
-	case LDAP_SCOPE_BASE:
 	case LDAP_X_SCOPE_EXACT:
 exact_match:
 		if ( dn_match( &op.o_req_ndn, assertDN ) ) {
@@ -886,9 +884,7 @@ void slap_sasl2dn( Operation *opx,
 	/* Must do an internal search */
 	op.o_bd = select_backend( &op.o_req_ndn, 0, 1 );
 
-	/* Massive shortcut: search scope == base */
 	switch ( op.oq_search.rs_scope ) {
-	case LDAP_SCOPE_BASE:
 	case LDAP_X_SCOPE_EXACT:
 		*sasldn = op.o_req_ndn;
 		op.o_req_ndn.bv_len = 0;
@@ -902,6 +898,7 @@ void slap_sasl2dn( Operation *opx,
 		/* correctly parsed, but illegal */
 		goto FINISHED;
 
+	case LDAP_SCOPE_BASE:
 	case LDAP_SCOPE_ONELEVEL:
 	case LDAP_SCOPE_SUBTREE:
 #ifdef LDAP_SCOPE_SUBORDINATE