From: Pierangelo Masarati <ando@openldap.org>
Date: Tue, 26 Mar 2002 18:21:25 +0000 (+0000)
Subject: quick hack to fix ITS#1654
X-Git-Tag: OPENLDAP_REL_ENG_2_0_24~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbfcc82d0206bf0498658367cddbfe74ffa5ddf6;p=thirdparty%2Fopenldap.git

quick hack to fix ITS#1654
---

diff --git a/CHANGES b/CHANGES
index 1307c92fa4..0b203ebb77 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,7 @@ OpenLDAP 2.0 Change Log
 OpenLDAP 2.0.24 Engineering
 	Fixed slapd acl group/dnaddr bug (ITS#1607)
 	Fixed ber_bvstrdup() empty string ("") bug (ITS#1662)
+	Fixed back-ldbm dn normalization bug in onelevel searches (ITS#1654)
 	Documentation
 		Updated release documents
 
diff --git a/servers/slapd/back-ldbm/search.c b/servers/slapd/back-ldbm/search.c
index 9a7a0a16f2..82ff79297a 100644
--- a/servers/slapd/back-ldbm/search.c
+++ b/servers/slapd/back-ldbm/search.c
@@ -283,10 +283,12 @@ searchit:
 			/* check scope */
 			if ( !scopeok && scope == LDAP_SCOPE_ONELEVEL ) {
 				if ( (dn = dn_parent( be, e->e_ndn )) != NULL ) {
-					(void) dn_normalize( dn );
-					scopeok = (dn == realbase)
-						? 1
-						: (strcmp( dn, realbase ) ? 0 : 1 );
+					char *newdn = dn;
+					while ( ASCII_SPACE( newdn[ 0 ] ) ) {
+						newdn++;
+					}
+					scopeok = ( strcmp( newdn, realbase ) 
+							? 0 : 1 );
 					free( dn );
 
 				} else {