Use dnIsSuffix

[openldap] / servers / slapd / back-ldbm / alias.c

diff --git a/servers/slapd/back-ldbm/alias.c b/servers/slapd/back-ldbm/alias.c
index e78fb6c53705088e5be6361618223a898fc93ef6..c2d4354fe1bb97a85ea9668f9a1d8b7f234f5a57 100644 (file)
--- a/servers/slapd/back-ldbm/alias.c
+++ b/servers/slapd/back-ldbm/alias.c
@@ -219,9 +219,11 @@ static char* get_alias_dn(
        int *err,
        const char **errmsg )
 {      
-       char *dn;
+       int rc;
+       struct berval ndn;
        Attribute *a;
-       AttributeDescription *aliasedObjectName = slap_schema.si_ad_aliasedObjectName;
+       AttributeDescription *aliasedObjectName
+               = slap_schema.si_ad_aliasedObjectName;
 
        a = attr_find( e->e_attrs, aliasedObjectName );
 
@@ -252,16 +254,14 @@ static char* get_alias_dn(
                return NULL;
        }
 
-       dn = ch_strdup( a->a_vals[0]->bv_val );
-
-       if( dn_normalize(dn) == NULL ) {
-               ch_free( dn );
+       rc = dnNormalize2( NULL, a->a_vals[0], &ndn );
+       if( rc != LDAP_SUCCESS ) {
                *err = LDAP_ALIAS_PROBLEM;
                *errmsg = "alias aliasedObjectName value is invalid";
                return NULL;
        }
 
-       return dn;
+       return ndn.bv_val;
 }
 
 static char* new_superior(