need a second function because of different free() routines

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

diff --git a/servers/slapd/back-ldap/unbind.c b/servers/slapd/back-ldap/unbind.c
index 63519bbc98a05b18bda2a4aed2f687517c676249..5197c0e90704d64dacbbd1f9bb0037f74be4abb8 100644 (file)
--- a/servers/slapd/back-ldap/unbind.c
+++ b/servers/slapd/back-ldap/unbind.c
@@ -1,6 +1,10 @@
 /* unbind.c - ldap backend unbind function */
 /* $OpenLDAP$ */
-
+/*
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
+/* This is an altered version */
 /*
  * Copyright 1999, Howard Chu, All rights reserved. <hyc@highlandsun.com>
  * 
@@ -20,6 +24,15 @@
  *    ever read sources, credits should appear in the documentation.
  * 
  * 4. This notice may not be removed or altered.
+ *
+ *
+ *
+ * Copyright 2000, Pierangelo Masarati, All rights reserved. <ando@sys-net.it>
+ *
+ * This software is being modified by Pierangelo Masarati.
+ * The previously reported conditions apply to the modified code as well.
+ * Changes in the original code are highlighted where required.
+ * Credits for the original code go to the author, Howard Chu.
  */
 
 #include "portable.h"
@@ -39,20 +52,48 @@ ldap_back_conn_destroy(
 )
 {
        struct ldapinfo *li = (struct ldapinfo *) be->be_private;
-       struct ldapconn *lc, *lp;
+       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 %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 );
-       for (lc = li->lcs, lp = (struct ldapconn *)&li->lcs; lc;
-               lp=lc, lc=lc->next)
-               if (lc->conn == conn) {
-                       lp->next = lc->next;
-                       break;
-               }
+       lc = avl_delete( &li->conntree, (caddr_t)&lc_curr, ldap_back_conn_cmp );
        ldap_pvt_thread_mutex_unlock( &li->conn_mutex );
 
        if (lc) {
-               ldap_unbind(lc->ld);
-               free(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 %ld\n",
+                       lc->conn->c_connid, 0, 0 );
+#endif
+
+#ifdef ENABLE_REWRITE
+               /*
+                * Cleanup rewrite session
+                */
+               rewrite_session_delete( li->rwmap.rwm_rw, conn );
+#endif /* ENABLE_REWRITE */
+
+               /*
+                * Needs a test because the handler may be corrupted,
+                * and calling ldap_unbind on a corrupted header results
+                * in a segmentation fault
+                */
+               ldap_back_conn_free( lc );
        }
 
        /* no response to unbind */