handle ordered values as appropriate (ITS#6516)

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

diff --git a/servers/slapd/back-ldap/unbind.c b/servers/slapd/back-ldap/unbind.c
index faa4b527dc8bd461c6f3e6fa343a6dea3200cc79..bc93a13dac5dee82b625db511cd3bfdde95a0a8e 100644 (file)
--- a/servers/slapd/back-ldap/unbind.c
+++ b/servers/slapd/back-ldap/unbind.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2006 The OpenLDAP Foundation.
+ * Copyright 1999-2009 The OpenLDAP Foundation.
  * Portions Copyright 1999-2003 Howard Chu.
  * Portions Copyright 2000-2003 Pierangelo Masarati.
  * All rights reserved.
@@ -48,21 +48,30 @@ ldap_back_conn_destroy(
        lc_curr.lc_conn = conn;
        
        ldap_pvt_thread_mutex_lock( &li->li_conninfo.lai_mutex );
+#if LDAP_BACK_PRINT_CONNTREE > 0
+       ldap_back_print_conntree( li, ">>> ldap_back_conn_destroy" );
+#endif /* LDAP_BACK_PRINT_CONNTREE */
        while ( ( lc = avl_delete( &li->li_conninfo.lai_tree, (caddr_t)&lc_curr, ldap_back_conn_cmp ) ) != NULL )
        {
+               assert( !LDAP_BACK_PCONN_ISPRIV( 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 );
+                       "=>ldap_back_conn_destroy: destroying conn %lu "
+                       "refcnt=%d flags=0x%08x\n",
+                       lc->lc_conn->c_connid, lc->lc_refcnt, lc->lc_lcflags );
 
-               assert( lc->lc_refcnt == 0 );
+               if ( lc->lc_refcnt > 0 ) {
+                       /* someone else might be accessing the connection;
+                        * mark for deletion */
+                       LDAP_BACK_CONN_CACHED_CLEAR( lc );
+                       LDAP_BACK_CONN_TAINTED_SET( lc );
 
-               /*
-                * 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 );
+               } else {
+                       ldap_back_conn_free( lc );
+               }
        }
+#if LDAP_BACK_PRINT_CONNTREE > 0
+       ldap_back_print_conntree( li, "<<< ldap_back_conn_destroy" );
+#endif /* LDAP_BACK_PRINT_CONNTREE */
        ldap_pvt_thread_mutex_unlock( &li->li_conninfo.lai_mutex );
 
        return 0;