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 9aabaf12eba742fd12ef0c0dceaac57f169240ef..c2d4354fe1bb97a85ea9668f9a1d8b7f234f5a57 100644 (file)
--- a/servers/slapd/back-ldbm/alias.c
+++ b/servers/slapd/back-ldbm/alias.c
@@ -31,7 +31,7 @@ static int dnlist_subordinate(
 Entry *deref_internal_r(
        Backend*        be,
        Entry*          alias,
-       const char*             dn_in,
+       struct berval*  dn_in,
        int*            err,
        Entry**         matched,
        const char**            text )
@@ -43,14 +43,15 @@ Entry *deref_internal_r(
        unsigned depth;
        char **dnlist;
 
-       assert( ( alias != NULL && dn == NULL ) || ( alias == NULL && dn != NULL ) );
+       assert( ( alias != NULL && dn_in == NULL )
+               || ( alias == NULL && dn_in != NULL ) );
 
        *matched = NULL;
-       *err = LDAP_SUCCESS;
+       *err = LDAP_NO_SUCH_OBJECT;
        *text = NULL;
 
        if( alias == NULL ) {
-               dn = ch_strdup( dn_in );
+               dn = ch_strdup( dn_in->bv_val );
                entry = dn2entry_r( be, dn, &sup );
 
        } else {
@@ -94,6 +95,7 @@ Entry *deref_internal_r(
 
                        /* check if aliasDN is a subordinate of any DN in our list */
                        if( dnlist_subordinate( dnlist, aliasDN ) ) {
+                               ch_free( aliasDN );
                                *matched = entry;
                                entry = NULL;
                                *err = LDAP_ALIAS_PROBLEM;
@@ -104,6 +106,7 @@ Entry *deref_internal_r(
                        /* attempt to dereference alias */
 
                        newe = dn2entry_r( be, aliasDN, &sup );
+                       ch_free( aliasDN );
 
                        if( newe != NULL ) {
                                free( dn );
@@ -112,7 +115,6 @@ Entry *deref_internal_r(
                                dn = ch_strdup( entry->e_ndn );
                                charray_add( &dnlist, dn );
                                continue;
-
                        }
                        
                        if ( sup != NULL ) {
@@ -156,6 +158,7 @@ Entry *deref_internal_r(
                        }
 
                        aliasDN = new_superior( dn, sup->e_ndn, supDN );
+                       free(supDN);
 
                        if( aliasDN == NULL ) {
                                free(aliasDN);
@@ -216,12 +219,11 @@ static char* get_alias_dn(
        int *err,
        const char **errmsg )
 {      
+       int rc;
+       struct berval ndn;
        Attribute *a;
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-       AttributeDescription *aliasedObjectName = slap_schema.si_ad_aliasedObjectName;
-#else
-       static const char *aliasedObjectName = "aliasedObjectName";
-#endif
+       AttributeDescription *aliasedObjectName
+               = slap_schema.si_ad_aliasedObjectName;
 
        a = attr_find( e->e_attrs, aliasedObjectName );
 
@@ -252,10 +254,17 @@ static char* get_alias_dn(
                return NULL;
        }
 
-       return a->a_vals[0]->bv_val;
+       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 ndn.bv_val;
 }
 
-char* new_superior(
+static char* new_superior(
        const char *dn,
        const char *oldSup,
        const char *newSup )
@@ -270,8 +279,8 @@ char* new_superior(
 
        newDN = ch_malloc( dnlen - olen + nlen + 1 );
 
-       memcpy( newDN, dn, dnlen - olen );
-       memcpy( &newDN[dnlen - olen], newSup, nlen );
+       AC_MEMCPY( newDN, dn, dnlen - olen );
+       AC_MEMCPY( &newDN[dnlen - olen], newSup, nlen );
        newDN[dnlen - olen + nlen] = '\0';
 
        return newDN;