From: Kurt Zeilenga <kurt@openldap.org>
Date: Sat, 2 Jun 2001 02:48:35 +0000 (+0000)
Subject: Import numericString fix from HEAD
X-Git-Tag: OPENLDAP_REL_ENG_2_0_12~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b76f03069b7f43a82161f037c682058de08c7f5;p=thirdparty%2Fopenldap.git

Import numericString fix from HEAD
---

diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index 2aa6613417..95d988dcb3 100644
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -408,6 +408,7 @@ bitStringValidate(
 	if( in->bv_len < 3 ) {
 		return LDAP_INVALID_SYNTAX;
 	}
+
 	if( in->bv_val[0] != 'B' ||
 		in->bv_val[1] != '\'' ||
 		in->bv_val[in->bv_len-1] != '\'' )
@@ -3182,8 +3183,6 @@ numericStringValidate(
 {
 	ber_len_t i;
 
-	/* disallow empty numeric strings */
-
 	for(i=0; i < in->bv_len; i++) {
 		if( !SLAP_NUMERIC(in->bv_val[i]) ) {
 			return LDAP_INVALID_SYNTAX;
@@ -3218,7 +3217,7 @@ numericStringNormalize(
 		}
 	}
 
-	assert( newval->bv_val < p );
+	assert( newval->bv_val <= p );
 	assert( q <= p );
 
 	/* null terminate */