Import resetting of c_dn/c_cdn after anonymous bind.

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

diff --git a/servers/slapd/back-ldbm/alias.c b/servers/slapd/back-ldbm/alias.c
index b7fbcf5328685ccdedb171207c453f2887322303..1d5a02484c5cca84e584935e1a9d4c2c66f0d5cb 100644 (file)
--- a/servers/slapd/back-ldbm/alias.c
+++ b/servers/slapd/back-ldbm/alias.c
@@ -12,6 +12,8 @@
 
 #include "portable.h"
 
+#ifdef SLAPD_ALIAS_DEREF
+
 #include <stdio.h>
 #include <string.h>
 #include <ac/socket.h>         /* Get struct sockaddr for slap.h */
@@ -54,8 +56,8 @@ Entry *derefAlias_r ( Backend     *be,
 
       Debug( LDAP_DEBUG_TRACE, "<= %s is an alias for %s\n", 
             e->e_dn, a->a_vals[0]->bv_val, 0 );
-      newDN = strdup (a->a_vals[0]->bv_val);
-      oldDN = strdup (e->e_dn);
+      newDN = ch_strdup (a->a_vals[0]->bv_val);
+      oldDN = ch_strdup (e->e_dn);
 
       /*
        * ok, so what happens if there is an alias in the DN of a dereferenced
@@ -112,30 +114,27 @@ char *derefDN ( Backend     *be,
 )
 {
   struct ldbminfo *li = (struct ldbminfo *) be->be_private;
-  char         *matched;
-  char         *newDN;
-  int  depth;
+  char         *matched = 0;
+  char         *newDN = NULL;
+  int  depth, i;
   Entry        *eMatched;
   Entry        *eDeref;
   Entry         *eNew;
   
 
   Debug( LDAP_DEBUG_TRACE, 
-        "<= dereferencing dn %s\n", 
+        "<= dereferencing dn: \"%s\"\n", 
         dn, 0, 0 );
   
-  newDN = strdup ( dn );
-  
+  newDN = ch_strdup ( dn );
+
   /* while we don't have a matched dn, deref the DN */
   for ( depth = 0;
        ( (eMatched = dn2entry_r( be, newDN, &matched )) == NULL) &&
          (depth < be->be_maxDerefDepth);
        ++depth ) {
     
-    /* free reader lock */
-    cache_return_entry_r(&li->li_cache, eMatched);
-
-    if (*matched) {    
+    if ((matched != NULL) && *matched) {       
       char *submatch;
       
       /* 
@@ -155,18 +154,26 @@ char *derefDN ( Backend     *be,
        
        if ((eNew = derefAlias_r( be, conn, op, eMatched )) == NULL) {
          free (matched);
+         matched = NULL;
          free (newDN);
+         newDN = NULL;
          free (remainder);
+         remainder = NULL;
          break; /*  no associated entry, dont deref */
        }
        else {
 
          Debug( LDAP_DEBUG_TRACE, "<= l&g we have %s vs %s \n", matched, eNew->e_dn, 0 );
 
-         if (!strcasecmp (matched, eNew->e_dn)) {
+         i = strcasecmp (matched, eNew->e_dn);
+          /* free reader lock */
+          cache_return_entry_r(&li->li_cache, eNew);
+         if (! i) {
            /* newDN same as old so not an alias, no need to go further */
            free (newDN);
+           newDN = NULL;
            free (matched);
+           matched = NULL;
            free (remainder);
            break;
          }
@@ -176,17 +183,14 @@ char *derefDN ( Backend     *be,
           * the new dn together
           */
          free (newDN);
-         free (matched);
-         
          newDN = ch_malloc (strlen(eMatched->e_dn) + rlen + 1);
          strcpy (newDN, remainder);
          strcat (newDN, eMatched->e_dn);
          Debug( LDAP_DEBUG_TRACE, "<= expanded to %s\n", newDN, 0, 0 );
 
+         free (matched);
+         matched = NULL;
          free (remainder);
-
-          /* free reader lock */
-          cache_return_entry_r(&li->li_cache, eNew);
        }
         /* free reader lock */
         cache_return_entry_r(&li->li_cache, eMatched);
@@ -201,6 +205,11 @@ char *derefDN ( Backend     *be,
     }
   }
   
+  if(eMatched != NULL) {
+    /* free reader lock */
+    cache_return_entry_r(&li->li_cache, eMatched);
+  }
+
   /*
    * the final part of the DN might be an alias 
    * so try to dereference it.
@@ -208,7 +217,7 @@ char *derefDN ( Backend     *be,
   if ( (eNew = dn2entry_r( be, newDN, &matched )) != NULL) {
     if ((eDeref = derefAlias_r( be, conn, op, eNew )) != NULL) {
       free (newDN);
-      newDN = strdup (eDeref->e_dn);
+      newDN = ch_strdup (eDeref->e_dn);
       /* free reader lock */
       cache_return_entry_r(&li->li_cache, eDeref);
     }
@@ -221,15 +230,20 @@ char *derefDN ( Backend     *be,
    */
   if (depth >= be->be_maxDerefDepth) {
     Debug( LDAP_DEBUG_TRACE, 
-          "<= max deref depth exceeded in derefDN for %s, result %s\n", 
+          "<= max deref depth exceeded in derefDN for \"%s\", result \"%s\"\n", 
           dn, newDN, 0 );
     send_ldap_result( conn, op, LDAP_ALIAS_PROBLEM, "",
                      "Maximum alias dereference depth exceeded for base" );
   }
-  
-  Debug( LDAP_DEBUG_TRACE, "<= returning deref DN of  %s\n", newDN, 0, 0 ); 
 
-  free(matched);
+  if (newDN == NULL) {
+    newDN = ch_strdup ( dn );
+  }
+  
+  Debug( LDAP_DEBUG_TRACE, "<= returning deref DN of \"%s\"\n", newDN, 0, 0 ); 
+  if (matched != NULL) free(matched);
 
   return newDN;
 }
+
+#endif /* SLAPD_ALIAS_DEREF */