Sync with HEAD

diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
index d50da9370dec3dfa66ac45135411d695db0d7ba7..ba6e98a6dc5b21f912e87076c73617b0dff8f09f 100644 (file)
--- a/libraries/libldap/ldap-int.h
+++ b/libraries/libldap/ldap-int.h
@@ -334,6 +334,7 @@ struct ldap {
        LDAPMessage     *ld_responses;  /* list of outstanding responses */
 
 #ifdef LDAP_R_COMPILE
+       ldap_pvt_thread_mutex_t ld_conn_mutex;
        ldap_pvt_thread_mutex_t ld_req_mutex;
        ldap_pvt_thread_mutex_t ld_res_mutex;
 #endif

diff --git a/libraries/libldap/open.c b/libraries/libldap/open.c
index dd97afa22f5eb57c7c44356bc92a42e4e4b6c012..eaa6a6cd1f139e26c757fd4bd981f51e86bac5fb 100644 (file)
--- a/libraries/libldap/open.c
+++ b/libraries/libldap/open.c
@@ -160,6 +160,7 @@ ldap_create( LDAP **ldp )
 #ifdef LDAP_R_COMPILE
        ldap_pvt_thread_mutex_init( &ld->ld_req_mutex );
        ldap_pvt_thread_mutex_init( &ld->ld_res_mutex );
+       ldap_pvt_thread_mutex_init( &ld->ld_conn_mutex );
 #endif
        *ldp = ld;
        return LDAP_SUCCESS;

diff --git a/libraries/libldap/request.c b/libraries/libldap/request.c
index 184d37d7a31c90c8de378bfa6812e3ca08fbffd4..e317ae864edd1a03392fe403db8093cba571b5c2 100644 (file)
--- a/libraries/libldap/request.c
+++ b/libraries/libldap/request.c
@@ -363,8 +363,14 @@ ldap_new_connection( LDAP *ld, LDAPURLDesc *srvlist, int use_ldsb,
        }
 
        lc->lconn_status = LDAP_CONNST_CONNECTED;
+#ifdef LDAP_R_COMPILE
+       ldap_pvt_thread_mutex_lock( &ld->ld_conn_mutex );
+#endif
        lc->lconn_next = ld->ld_conns;
        ld->ld_conns = lc;
+#ifdef LDAP_R_COMPILE
+       ldap_pvt_thread_mutex_unlock( &ld->ld_conn_mutex );
+#endif
 
        /*
         * XXX for now, we always do a synchronous bind.  This will have
@@ -458,7 +464,11 @@ find_connection( LDAP *ld, LDAPURLDesc *srv, int any )
        LDAPConn        *lc;
        LDAPURLDesc     *lcu, *lsu;
        int lcu_port, lsu_port;
+       int found = 0;
 
+#ifdef LDAP_R_COMPILE
+       ldap_pvt_thread_mutex_lock( &ld->ld_conn_mutex );
+#endif
        for ( lc = ld->ld_conns; lc != NULL; lc = lc->lconn_next ) {
                lcu = lc->lconn_server;
                lcu_port = ldap_pvt_url_scheme_port( lcu->lud_scheme,
@@ -468,20 +478,25 @@ find_connection( LDAP *ld, LDAPURLDesc *srv, int any )
                        lsu_port = ldap_pvt_url_scheme_port( lsu->lud_scheme,
                                lsu->lud_port );
 
-                       if ( strcmp( lcu->lud_scheme, lsu->lud_scheme ) == 0
+                       if ( lsu_port == lcu_port
+                               && strcmp( lcu->lud_scheme, lsu->lud_scheme ) == 0
                                && lcu->lud_host != NULL && *lcu->lud_host != '\0'
                            && lsu->lud_host != NULL && *lsu->lud_host != '\0'
-                               && strcasecmp( lsu->lud_host, lcu->lud_host ) == 0
-                           && lsu_port == lcu_port )
+                               && strcasecmp( lsu->lud_host, lcu->lud_host ) == 0 )
                        {
-                               return lc;
+                               found = 1;
+                               break;
                        }
 
                        if ( !any ) break;
                }
+               if ( found )
+                       break;
        }
-
-       return NULL;
+#ifdef LDAP_R_COMPILE
+       ldap_pvt_thread_mutex_unlock( &ld->ld_conn_mutex );
+#endif
+       return lc;
 }
 
 
@@ -519,6 +534,9 @@ ldap_free_connection( LDAP *ld, LDAPConn *lc, int force, int unbind )
                ldap_int_sasl_close( ld, lc );
 
                prevlc = NULL;
+#ifdef LDAP_R_COMPILE
+       ldap_pvt_thread_mutex_lock( &ld->ld_conn_mutex );
+#endif
                for ( tmplc = ld->ld_conns;
                        tmplc != NULL;
                        tmplc = tmplc->lconn_next )
@@ -533,6 +551,9 @@ ldap_free_connection( LDAP *ld, LDAPConn *lc, int force, int unbind )
                        }
                        prevlc = tmplc;
                }
+#ifdef LDAP_R_COMPILE
+       ldap_pvt_thread_mutex_unlock( &ld->ld_conn_mutex );
+#endif
                ldap_free_urllist( lc->lconn_server );
 #ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
                if ( lc->lconn_krbinstance != NULL ) {
@@ -583,7 +604,7 @@ ldap_dump_connection( LDAP *ld, LDAPConn *lconns, int all )
        LDAPConn        *lc;
        char            timebuf[32];
 
-       fprintf( stderr, "** Connection%s:\n", all ? "s" : "" );
+       fprintf( stderr, "** ld %p Connection%s:\n", ld, all ? "s" : "" );
        for ( lc = lconns; lc != NULL; lc = lc->lconn_next ) {
                if ( lc->lconn_server != NULL ) {
                        fprintf( stderr, "* host: %s  port: %d%s\n",
@@ -630,7 +651,7 @@ ldap_dump_requests_and_responses( LDAP *ld )
 #ifdef LDAP_R_COMPILE
        ldap_pvt_thread_mutex_lock( &ld->ld_req_mutex );
 #endif
-       fprintf( stderr, "** Outstanding Requests:\n" );
+       fprintf( stderr, "** ld %p Outstanding Requests:\n", ld );
        if (( lr = ld->ld_requests ) == NULL ) {
                fprintf( stderr, "   Empty\n" );
        }
@@ -648,7 +669,7 @@ ldap_dump_requests_and_responses( LDAP *ld )
 #ifdef LDAP_R_COMPILE
        ldap_pvt_thread_mutex_unlock( &ld->ld_req_mutex );
 #endif
-       fprintf( stderr, "** Response Queue:\n" );
+       fprintf( stderr, "** ld %p Response Queue:\n", ld );
        if (( lm = ld->ld_responses ) == NULL ) {
                fprintf( stderr, "   Empty\n" );
        }

diff --git a/libraries/libldap/result.c b/libraries/libldap/result.c
index fa36b83651fae4a0a80b9f081e4e9007c3fa41c0..172ab6311efeaf0f81b96e0c096f900c3d19cebd 100644 (file)
--- a/libraries/libldap/result.c
+++ b/libraries/libldap/result.c
@@ -111,7 +111,7 @@ ldap_result(
        assert( ld != NULL );
        assert( result != NULL );
 
-       Debug( LDAP_DEBUG_TRACE, "ldap_result msgid %d\n", msgid, 0, 0 );
+       Debug( LDAP_DEBUG_TRACE, "ldap_result ld %p msgid %d\n", ld, msgid, 0 );
 
 #ifdef LDAP_R_COMPILE
        ldap_pvt_thread_mutex_lock( &ld->ld_res_mutex );
@@ -146,8 +146,8 @@ chkResponseList(
         */
 
        Debug( LDAP_DEBUG_TRACE,
-               "ldap_chkResponseList for msgid=%d, all=%d\n",
-           msgid, all, 0 );
+               "ldap_chkResponseList ld %p msgid %d all %d\n",
+           ld, msgid, all );
        lastlm = &ld->ld_responses;
        for ( lm = ld->ld_responses; lm != NULL; lm = nextlm ) {
                nextlm = lm->lm_next;
@@ -207,11 +207,11 @@ chkResponseList(
 #ifdef LDAP_DEBUG
        if( lm == NULL) {
                Debug( LDAP_DEBUG_TRACE,
-                       "ldap_chkResponseList returns NULL\n", 0, 0, 0);
+                       "ldap_chkResponseList returns ld %p NULL\n", ld, 0, 0);
        } else {
                Debug( LDAP_DEBUG_TRACE,
-                       "ldap_chkResponseList returns msgid %d, type 0x%02lu\n",
-                       lm->lm_msgid, (unsigned long) lm->lm_msgtype, 0);
+                       "ldap_chkResponseList returns ld %p msgid %d, type 0x%02lu\n",
+                       ld, lm->lm_msgid, (unsigned long) lm->lm_msgtype);
        }
 #endif
     return lm;
@@ -238,11 +238,11 @@ wait4msg(
 
 #ifdef LDAP_DEBUG
        if ( timeout == NULL ) {
-               Debug( LDAP_DEBUG_TRACE, "wait4msg (infinite timeout), msgid %d\n",
-                   msgid, 0, 0 );
+               Debug( LDAP_DEBUG_TRACE, "wait4msg ld %p msgid %d (infinite timeout)\n",
+                   ld, msgid, 0 );
        } else {
-               Debug( LDAP_DEBUG_TRACE, "wait4msg (timeout %ld sec, %ld usec), msgid %d\n",
-                      (long) timeout->tv_sec, (long) timeout->tv_usec, msgid );
+               Debug( LDAP_DEBUG_TRACE, "wait4msg ld %p msgid %d (timeout %ld usec)\n",
+                   ld, msgid, (long)timeout->tv_sec * 1000000 + timeout->tv_usec );
        }
 #endif /* LDAP_DEBUG */
 
@@ -259,8 +259,8 @@ wait4msg(
        while ( rc == -2 ) {
 #ifdef LDAP_DEBUG
                if ( ldap_debug & LDAP_DEBUG_TRACE ) {
-                       Debug( LDAP_DEBUG_TRACE, "wait4msg continue, msgid %d, all %d\n",
-                               msgid, all, 0 );
+                       Debug( LDAP_DEBUG_TRACE, "wait4msg continue ld %p msgid %d all %d\n",
+                               ld, msgid, all );
                        ldap_dump_connection( ld, ld->ld_conns, 1 );
                        ldap_dump_requests_and_responses( ld );
                }
@@ -272,16 +272,28 @@ wait4msg(
                } else {
                        int lc_ready = 0;
 
+#ifdef LDAP_R_COMPILE
+                       ldap_pvt_thread_mutex_lock( &ld->ld_conn_mutex );
+#endif
                        for ( lc = ld->ld_conns; lc != NULL; lc = nextlc ) {
                                nextlc = lc->lconn_next;
                                if ( ber_sockbuf_ctrl( lc->lconn_sb,
                                                LBER_SB_OPT_DATA_READY, NULL ) ) {
+#ifdef LDAP_R_COMPILE
+                                       ldap_pvt_thread_mutex_unlock( &ld->ld_conn_mutex );
+#endif
                                        rc = try_read1msg( ld, msgid, all, lc->lconn_sb,
                                                &lc, result );
+#ifdef LDAP_R_COMPILE
+                                       ldap_pvt_thread_mutex_lock( &ld->ld_conn_mutex );
+#endif
                                        lc_ready = 1;
                                        break;
                                }
-                       }
+                       }
+#ifdef LDAP_R_COMPILE
+                       ldap_pvt_thread_mutex_unlock( &ld->ld_conn_mutex );
+#endif
 
                        if ( !lc_ready ) {
                                rc = ldap_int_select( ld, tvp );
@@ -318,6 +330,7 @@ wait4msg(
                                        }
 #ifdef LDAP_R_COMPILE
                                        ldap_pvt_thread_mutex_unlock( &ld->ld_req_mutex );
+                                       ldap_pvt_thread_mutex_lock( &ld->ld_conn_mutex );
 #endif
                                        for ( lc = ld->ld_conns; rc == -2 && lc != NULL;
                                                lc = nextlc )
@@ -326,11 +339,20 @@ wait4msg(
                                                if ( lc->lconn_status == LDAP_CONNST_CONNECTED &&
                                                        ldap_is_read_ready( ld, lc->lconn_sb ))
                                                {
+#ifdef LDAP_R_COMPILE
+                                                       ldap_pvt_thread_mutex_unlock( &ld->ld_conn_mutex );
+#endif
                                                        rc = try_read1msg( ld, msgid, all,
                                                                lc->lconn_sb, &lc, result );
                                                                if ( lc == NULL ) lc = nextlc;
+#ifdef LDAP_R_COMPILE
+                                                       ldap_pvt_thread_mutex_lock( &ld->ld_conn_mutex );
+#endif
                                                }
                                        }
+#ifdef LDAP_R_COMPILE
+                                       ldap_pvt_thread_mutex_unlock( &ld->ld_conn_mutex );
+#endif
                                }
                        }
                }
@@ -345,8 +367,8 @@ wait4msg(
                        }
                        tv.tv_sec = tv0.tv_sec;
 
-                       Debug( LDAP_DEBUG_TRACE, "wait4msg:  %ld secs to go\n",
-                              (long) tv.tv_sec, 0, 0 );
+                       Debug( LDAP_DEBUG_TRACE, "wait4msg ld %p %ld secs to go\n",
+                              ld, (long) tv.tv_sec, 0 );
                        start_time = tmp_time;
                }
        }
@@ -395,7 +417,7 @@ try_read1msg(
        assert( lcp != NULL );
        assert( *lcp != NULL );
        
-       Debug( LDAP_DEBUG_TRACE, "read1msg: msgid %d, all %d\n", msgid, all, 0 );
+       Debug( LDAP_DEBUG_TRACE, "read1msg: ld %p msgid %d all %d\n", ld, msgid, all );
 
        lc = *lcp;
 
@@ -457,7 +479,8 @@ nextresp3:
 
        /* if it's been abandoned, toss it */
        if ( ldap_abandoned( ld, id ) ) {
-               Debug( LDAP_DEBUG_ANY, "abandoned\n", 0, 0, 0);
+               Debug( LDAP_DEBUG_ANY, "abandoned ld %p msgid %ld\n",
+                        ld, (long) id, 0);
 retry_ber:
                ber_free( ber, 1 );
                if ( ber_sockbuf_ctrl( sb, LBER_SB_OPT_DATA_READY, NULL ) ) {
@@ -469,8 +492,8 @@ retry_ber:
        lr = ldap_find_request_by_msgid( ld, id );
        if ( lr == NULL ) {
                Debug( LDAP_DEBUG_ANY,
-                   "no request for response with msgid %ld (tossing)\n",
-                   (long) id, 0, 0 );
+                   "no request for response on ld %p msgid %ld (tossing)\n",
+                   ld, (long) id, 0 );
                goto retry_ber;
        }
 #ifdef LDAP_CONNECTIONLESS
@@ -487,9 +510,8 @@ nextresp2:
        }
 
        Debug( LDAP_DEBUG_TRACE,
-               "ldap_read: message type %s msgid %ld, original id %ld\n",
-               ldap_int_msgtype2str( tag ),
-               (long) lr->lr_msgid, (long) lr->lr_origid );
+               "read1msg: ld %p msgid %ld message type %s\n",
+               ld, (long) lr->lr_msgid, ldap_int_msgtype2str( tag ));
 
        id = lr->lr_origid;
        refer_cnt = 0;
@@ -572,8 +594,8 @@ nextresp2:
                                                        rc = LDAP_DECODING_ERROR;
                                                        lr->lr_status = LDAP_REQST_COMPLETED;
                                                        Debug( LDAP_DEBUG_TRACE,
-                                                           "read1msg: referral decode error, mark request completed, id = %d\n",
-                                                                   lr->lr_msgid, 0, 0);
+                                                           "read1msg: referral decode error, mark request completed, ld %p msgid %d\n",
+                                                                   ld, lr->lr_msgid, 0);
                                                } else {
                                                        /* Chase the referral 
                                                         * Note: refs arrary is freed by ldap_chase_v3referrals
@@ -582,8 +604,8 @@ nextresp2:
                                                            0, &lr->lr_res_error, &hadref );
                                                        lr->lr_status = LDAP_REQST_COMPLETED;
                                                        Debug( LDAP_DEBUG_TRACE,
-                                                           "read1msg:  referral chased, mark request completed, id = %d\n",
-                                                           lr->lr_msgid, 0, 0);
+                                                           "read1msg: referral chased, mark request completed, ld %p msgid %d\n",
+                                                           ld, lr->lr_msgid, 0);
                                                        if( refer_cnt > 0) {
                                                                /* Referral successfully chased */
                                                                v3ref = V3REF_SUCCESS;
@@ -683,7 +705,7 @@ Debug( LDAP_DEBUG_TRACE,
                }
 
                Debug( LDAP_DEBUG_TRACE,
-                   "read1msg:  %d new referrals\n", refer_cnt, 0, 0 );
+                   "read1msg: ld %p %d new referrals\n", ld, refer_cnt, 0 );
 
                if ( refer_cnt != 0 ) { /* chasing referrals */
                        ber_free( ber, 1 );
@@ -704,7 +726,7 @@ Debug( LDAP_DEBUG_TRACE,
 
                        lr->lr_status = LDAP_REQST_COMPLETED; /* declare this request done */
                        Debug( LDAP_DEBUG_TRACE,
-                           "read1msg:  mark request completed, id = %d\n", lr->lr_msgid, 0, 0);
+                           "read1msg:  mark request completed, ld %p msgid %d\n", ld, lr->lr_msgid, 0);
                        while ( lr->lr_parent != NULL ) {
                                merge_error_info( ld, lr->lr_parent, lr );
 
@@ -731,8 +753,8 @@ Debug( LDAP_DEBUG_TRACE,
                        {
                                id = lr->lr_msgid;
                                tag = lr->lr_res_msgtype;
-                               Debug( LDAP_DEBUG_ANY, "request %ld done\n",
-                                   (long) id, 0, 0 );
+                               Debug( LDAP_DEBUG_ANY, "request done: ld %p msgid %ld\n",
+                                   ld, (long) id, 0 );
 Debug( LDAP_DEBUG_TRACE,
 "res_errno: %d, res_error: <%s>, res_matched: <%s>\n",
 lr->lr_res_errno, lr->lr_res_error ? lr->lr_res_error : "",
@@ -903,8 +925,8 @@ lr->lr_res_matched ? lr->lr_res_matched : "" );
                goto exit;
        }
 
-       Debug( LDAP_DEBUG_TRACE, "adding response id %ld type %ld:\n",
-           (long) newmsg->lm_msgid, (long) newmsg->lm_msgtype, 0 );
+       Debug( LDAP_DEBUG_TRACE, "adding response ld %p msgid %ld type %ld:\n",
+           ld, (long) newmsg->lm_msgid, (long) newmsg->lm_msgtype );
 
        /* part of a search response - add to end of list of entries */
        l->lm_chain_tail->lm_chain = newmsg;