improved filter mapping/rewrite; improved result rewriting; improved attribute/object...

[openldap] / servers / slapd / back-ldap / unbind.c

diff --git a/servers/slapd/back-ldap/unbind.c b/servers/slapd/back-ldap/unbind.c
index 49b2f3ef19ceac2446fca41b3cef951e99156dba..523657ef240fd7af71e99e17823bb3ad4a1b4a91 100644 (file)
--- a/servers/slapd/back-ldap/unbind.c
+++ b/servers/slapd/back-ldap/unbind.c
@@ -1,7 +1,7 @@
 /* unbind.c - ldap backend unbind function */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /* This is an altered version */
@@ -54,21 +54,32 @@ ldap_back_conn_destroy(
        struct ldapinfo *li = (struct ldapinfo *) be->be_private;
        struct ldapconn *lc, lc_curr;
 
+#ifdef NEW_LOGGING
+       LDAP_LOG( BACK_LDAP, INFO,
+               "ldap_back_conn_destroy: fetching conn %ld\n", conn->c_connid, 0, 0 );
+#else /* !NEW_LOGGING */
        Debug( LDAP_DEBUG_TRACE,
-               "=>ldap_back_conn_destroy: fetching conn %d\n",
+               "=>ldap_back_conn_destroy: fetching conn %ld\n",
                conn->c_connid, 0, 0 );
-       
+#endif /* !NEW_LOGGING */
 
        lc_curr.conn = conn;
+       lc_curr.local_dn = conn->c_ndn;
        
        ldap_pvt_thread_mutex_lock( &li->conn_mutex );
        lc = avl_delete( &li->conntree, (caddr_t)&lc_curr, ldap_back_conn_cmp );
        ldap_pvt_thread_mutex_unlock( &li->conn_mutex );
 
        if (lc) {
+#ifdef NEW_LOGGING
+               LDAP_LOG( BACK_LDAP, DETAIL1, 
+                       "ldap_back_conn_destroy: destroying conn %ld\n", 
+                       conn->c_connid, 0, 0 );
+#else /* !NEW_LOGGING */
                Debug( LDAP_DEBUG_TRACE,
-                       "=>ldap_back_conn_destroy: destroying conn %d\n",
+                       "=>ldap_back_conn_destroy: destroying conn %ld\n",
                        lc->conn->c_connid, 0, 0 );
+#endif
 
 #ifdef ENABLE_REWRITE
                /*
@@ -82,11 +93,7 @@ ldap_back_conn_destroy(
                 * and calling ldap_unbind on a corrupted header results
                 * in a segmentation fault
                 */
-               ldap_unbind(lc->ld);
-               if ( lc->bound_dn ) {
-                       free( lc->bound_dn );
-               }
-               free( lc );
+               ldap_back_conn_free( lc );
        }
 
        /* no response to unbind */