address ITS#4332; might remove dynamicObject counting

[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..141ac4a4cb64a133a475401030e32c83f67f1a0c 100644 (file)
--- a/servers/slapd/back-ldap/unbind.c
+++ b/servers/slapd/back-ldap/unbind.c
@@ -1,31 +1,31 @@
 /* unbind.c - ldap backend unbind function */
 /* $OpenLDAP$ */
-
-/*
- * Copyright 1999, Howard Chu, All rights reserved. <hyc@highlandsun.com>
- * 
- * Permission is granted to anyone to use this software for any purpose
- * on any computer system, and to alter it and redistribute it, subject
- * to the following restrictions:
- * 
- * 1. The author is not responsible for the consequences of use of this
- *    software, no matter how awful, even if they arise from flaws in it.
- * 
- * 2. The origin of this software must not be misrepresented, either by
- *    explicit claim or by omission.  Since few users ever read sources,
- *    credits should appear in the documentation.
- * 
- * 3. Altered versions must be plainly marked as such, and must not be
- *    misrepresented as being the original software.  Since few users
- *    ever read sources, credits should appear in the documentation.
- * 
- * 4. This notice may not be removed or altered.
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1999-2006 The OpenLDAP Foundation.
+ * Portions Copyright 1999-2003 Howard Chu.
+ * Portions Copyright 2000-2003 Pierangelo Masarati.
+ * 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>.
+ */
+/* ACKNOWLEDGEMENTS:
+ * This work was initially developed by the Howard Chu for inclusion
+ * in OpenLDAP Software and subsequently enhanced by Pierangelo
+ * Masarati.
  */
 
 #include "portable.h"
 
 #include <stdio.h>
 
+#include <ac/errno.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 
@@ -34,25 +34,37 @@
 
 int
 ldap_back_conn_destroy(
-    Backend            *be,
-    Connection         *conn
+               Backend         *be,
+               Connection      *conn
 )
 {
-       struct ldapinfo *li = (struct ldapinfo *) be->be_private;
-       struct ldapconn *lc, *lp;
-
-       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;
-               }
-       ldap_pvt_thread_mutex_unlock( &li->conn_mutex );
-
-       if (lc) {
-               ldap_unbind(lc->ld);
-               free(lc);
+       ldapinfo_t      *li = (ldapinfo_t *) be->be_private;
+       ldapconn_t      *lc = NULL, lc_curr;
+
+       Debug( LDAP_DEBUG_TRACE,
+               "=>ldap_back_conn_destroy: fetching conn %ld\n",
+               conn->c_connid, 0, 0 );
+
+       lc_curr.lc_conn = conn;
+       lc_curr.lc_local_ndn = conn->c_ndn;
+       
+       ldap_pvt_thread_mutex_lock( &li->li_conninfo.lai_mutex );
+       lc = avl_delete( &li->li_conninfo.lai_tree, (caddr_t)&lc_curr, ldap_back_conn_cmp );
+       ldap_pvt_thread_mutex_unlock( &li->li_conninfo.lai_mutex );
+
+       if ( lc ) {
+               Debug( LDAP_DEBUG_TRACE,
+                       "=>ldap_back_conn_destroy: destroying conn %ld (refcnt=%u)\n",
+                       LDAP_BACK_PCONN_ID( lc->lc_conn ), lc->lc_refcnt, 0 );
+
+               assert( lc->lc_refcnt == 0 );
+
+               /*
+                * 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 */