Back out part of last commit

diff --git a/servers/slapd/back-ldbm/search.c b/servers/slapd/back-ldbm/search.c
index 2ff93defff4c4ee198f16c4a069591fc9ba3bf8f..44925228df57df9eb3bdad930e45e87b3caf7470 100644 (file)
--- a/servers/slapd/back-ldbm/search.c
+++ b/servers/slapd/back-ldbm/search.c
@@ -347,12 +347,6 @@ searchit:
                        {
                                scopeok = dnIsSuffix( &e->e_nname, &realbase );
 
-                       } else if ( !scopeok
-                               && op->ors_scope == LDAP_SCOPE_SUBORDINATE )
-                       {
-                               scopeok = !dn_match( &e->e_nname, &realbase )
-                                       && dnIsSuffix( &e->e_nname, &realbase );
-
                        } else {
                                scopeok = 1;
                        }
@@ -409,12 +403,6 @@ searchit:
                        {
                                scopeok = dnIsSuffix( &e->e_nname, &realbase );
 
-                       } else if ( !scopeok &&
-                               op->ors_scope == LDAP_SCOPE_SUBORDINATE )
-                       {
-                               scopeok = !dn_match( &e->e_nname, &realbase )
-                                       && dnIsSuffix( &e->e_nname, &realbase );
-
                        } else {
                                scopeok = 1;
                        }