From: Luke Howard <lukeh@openldap.org>
Date: Wed, 23 Apr 2003 11:29:11 +0000 (+0000)
Subject: slapi_dn_normalize() should pretty DN; slapi_dn_normalize_case() should normalize it
X-Git-Tag: OPENLDAP_REL_ENG_2_2_0ALPHA~265
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b1b8d9d651d285f88a98d41db43924ea83399e27;p=openldap

slapi_dn_normalize() should pretty DN; slapi_dn_normalize_case() should normalize it
(appears to be correct based on iPlanet documentation)
---

diff --git a/servers/slapd/slapi/slapi_utils.c b/servers/slapd/slapi/slapi_utils.c
index 4839a4981a..ec0488e20d 100644
--- a/servers/slapd/slapi/slapi_utils.c
+++ b/servers/slapd/slapi/slapi_utils.c
@@ -850,24 +850,18 @@ slapi_dn_normalize( char *dn )
 {
 #ifdef LDAP_SLAPI
 	struct berval	bdn;
-	struct berval	ndn;
+	struct berval	pdn;
 
 	assert( dn != NULL );
 	
 	bdn.bv_val = dn;
 	bdn.bv_len = strlen( dn );
 
-	if ( dnNormalize2( NULL, &bdn, &ndn, NULL ) != LDAP_SUCCESS ) {
+	if ( dnPretty2( NULL, &bdn, &pdn, NULL ) != LDAP_SUCCESS ) {
 		return NULL;
 	}
 
-	/*
-	 * FIXME: ain't it safe to set dn = ndn.bv_val ?
-	 */
-	dn = ch_strdup( ndn.bv_val );
-	ch_free( ndn.bv_val );
-	
-	return dn;
+	return pdn.bv_val;
 #else /* LDAP_SLAPI */
 	return NULL;
 #endif /* LDAP_SLAPI */
@@ -877,7 +871,19 @@ char *
 slapi_dn_normalize_case( char *dn ) 
 {
 #ifdef LDAP_SLAPI
-	return slapi_dn_normalize( dn );
+	struct berval	bdn;
+	struct berval	ndn;
+
+	assert( dn != NULL );
+	
+	bdn.bv_val = dn;
+	bdn.bv_len = strlen( dn );
+
+	if ( dnNormalize2( NULL, &bdn, &ndn, NULL ) != LDAP_SUCCESS ) {
+		return NULL;
+	}
+
+	return ndn.bv_val;
 #else /* LDAP_SLAPI */
 	return NULL;
 #endif /* LDAP_SLAPI */