From: Pierangelo Masarati <ando@openldap.org>
Date: Thu, 8 Mar 2007 21:09:09 +0000 (+0000)
Subject: import fix to ITS#4823
X-Git-Tag: OPENLDAP_REL_ENG_2_3_35~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf28547b97d62a1743a1b2d7ac6aea3ac936b2c1;p=thirdparty%2Fopenldap.git

import fix to ITS#4823
---

diff --git a/CHANGES b/CHANGES
index 2e371e26b6..a061c5f1eb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,7 @@ OpenLDAP 2.3 Change Log
 OpenLDAP 2.3.35 Engineering
 	Fixed entry consistency check in str2entry2 (ITS#4852)
 	Fixed str2anlist handling of undefined attrs/OCs (ITS#4854)
+	Fixed zero-length IA5string handling (ITS#4823)
 	Fixed slapd-bdb/hdb startup with missing shm env (ITS#4851)
 	Fixed slapd-meta/slapo-rwm filter mapping
 	Fixed slapd-sql subtree shortcut (ITS#4856)
diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index 37ccfa259f..8544f641cb 100644
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -2080,8 +2080,6 @@ IA5StringValidate(
 {
 	ber_len_t i;
 
-	if( BER_BVISEMPTY( val ) ) return LDAP_INVALID_SYNTAX;
-
 	for(i=0; i < val->bv_len; i++) {
 		if( !LDAP_ASCII(val->bv_val[i]) ) {
 			return LDAP_INVALID_SYNTAX;
@@ -2103,8 +2101,6 @@ IA5StringNormalize(
 	char *p, *q;
 	int casefold = !SLAP_MR_ASSOCIATED(mr, slap_schema.si_mr_caseExactIA5Match);
 
-	assert( !BER_BVISEMPTY( val ) );
-
 	assert( SLAP_MR_IS_VALUE_OF_SYNTAX( use ));
 
 	p = val->bv_val;
@@ -2147,12 +2143,6 @@ IA5StringNormalize(
 	*q = '\0';
 
 	normalized->bv_len = q - normalized->bv_val;
-	if( BER_BVISEMPTY( normalized ) ) {
-		normalized->bv_val = slap_sl_realloc( normalized->bv_val, 2, ctx );
-		normalized->bv_val[0] = ' ';
-		normalized->bv_val[1] = '\0';
-		normalized->bv_len = 1;
-	}
 
 	return LDAP_SUCCESS;
 }