Changed struct berval ** to BVarray

[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..0918cabc5845d0abfe5af5e1853199323e7ae225 100644 (file)
--- a/servers/slapd/back-ldap/unbind.c
+++ b/servers/slapd/back-ldap/unbind.c
@@ -54,10 +54,15 @@ ldap_back_conn_destroy(
        struct ldapinfo *li = (struct ldapinfo *) be->be_private;
        struct ldapconn *lc, lc_curr;
 
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
+                       "ldap_back_conn_destroy: fetching conn %ld\n",
+                       conn->c_connid ));
+#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;
        
@@ -67,7 +72,7 @@ ldap_back_conn_destroy(
 
        if (lc) {
                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 );
 
 #ifdef ENABLE_REWRITE
@@ -83,8 +88,8 @@ ldap_back_conn_destroy(
                 * in a segmentation fault
                 */
                ldap_unbind(lc->ld);
-               if ( lc->bound_dn ) {
-                       free( lc->bound_dn );
+               if ( lc->bound_dn.bv_val ) {
+                       free( lc->bound_dn.bv_val );
                }
                free( lc );
        }