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 4839a4981aa2a908c825bc209100bee874894099..ec0488e20d578f24f844f258883b00e368ce8230 100644 (file)
--- 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 */