Plug memory leak

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

diff --git a/servers/slapd/back-ldbm/id2children.c b/servers/slapd/back-ldbm/id2children.c
index c27496d5730b6f5a47e6370ee3ba6c71239f56a8..2825e33d3a2e2caadbae284ca6594d4064ff9ae9 100644 (file)
--- a/servers/slapd/back-ldbm/id2children.c
+++ b/servers/slapd/back-ldbm/id2children.c
@@ -1,8 +1,17 @@
 /* id2children.c - routines to deal with the id2children index */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2005 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -15,7 +24,6 @@
 #include "slap.h"
 #include "back-ldbm.h"
 
-
 int
 has_children(
     Backend    *be,
@@ -29,25 +37,14 @@ has_children(
 
        ldbm_datum_init( key );
 
-#ifdef NEW_LOGGING
-       LDAP_LOG(( "id2children", LDAP_LEVEL_ENTRY,
-                  "has_children: enter %ld\n", p->e_id ));
-#else
        Debug( LDAP_DEBUG_TRACE, "=> has_children( %ld )\n", p->e_id , 0, 0 );
-#endif
 
 
        if ( (db = ldbm_cache_open( be, "dn2id", LDBM_SUFFIX,
            LDBM_WRCREAT )) == NULL ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG(( "id2children", LDAP_LEVEL_ERR,
-                          "has_children: could not open \"dn2id%s\"\n",
-                          LDBM_SUFFIX ));
-#else
                Debug( LDAP_DEBUG_ANY,
                    "<= has_children -1 could not open \"dn2id%s\"\n",
                    LDBM_SUFFIX, 0, 0 );
-#endif
 
                return( 0 );
        }
@@ -67,14 +64,8 @@ has_children(
                rc = 1;
        }
 
-#ifdef NEW_LOGGING
-       LDAP_LOG(( "id2children", LDAP_LEVEL_ENTRY,
-                  "has_children: id (%ld) %s children.\n",
-                  p->e_id, rc ? "has" : "doesn't have" ));
-#else
        Debug( LDAP_DEBUG_TRACE, "<= has_children( %ld ): %s\n",
                p->e_id, rc ? "yes" : "no", 0 );
-#endif
 
        return( rc );
 }