X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fresult.c;h=172ab6311efeaf0f81b96e0c096f900c3d19cebd;hb=2dfd312fa12a765a5ad311f6c9bf8dce76a63155;hp=dbf75ee1409054ac813619cb78f4f097a0110f33;hpb=62d050a0bdf922914124c1c027a2b70224d60bd3;p=openldap diff --git a/libraries/libldap/result.c b/libraries/libldap/result.c index dbf75ee140..172ab6311e 100644 --- a/libraries/libldap/result.c +++ b/libraries/libldap/result.c @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2004 The OpenLDAP Foundation. + * Copyright 1998-2005 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -111,11 +111,7 @@ ldap_result( assert( ld != NULL ); assert( result != NULL ); -#ifdef NEW_LOGGING - LDAP_LOG ( OPERATION, ARGS, "ldap_result msgid %d\n", msgid, 0, 0 ); -#else - Debug( LDAP_DEBUG_TRACE, "ldap_result msgid %d\n", msgid, 0, 0 ); -#endif + 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 ); @@ -141,7 +137,7 @@ chkResponseList( int msgid, int all) { - LDAPMessage *lm, *lastlm, *nextlm; + LDAPMessage *lm, **lastlm, *nextlm; /* * Look through the list of responses we have received on * this association and see if the response we're interested in @@ -149,35 +145,21 @@ chkResponseList( * wait until it arrives or timeout occurs. */ -#ifdef NEW_LOGGING - LDAP_LOG ( OPERATION, ARGS, "ldap_chkResponseList for msgid=%d, all=%d\n", - msgid, all, 0 ); -#else Debug( LDAP_DEBUG_TRACE, - "ldap_chkResponseList for msgid=%d, all=%d\n", - msgid, all, 0 ); -#endif - lastlm = NULL; + "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; if ( ldap_abandoned( ld, lm->lm_msgid ) ) { -#ifdef NEW_LOGGING - LDAP_LOG ( OPERATION, DETAIL1, - "ldap_chkResponseList msg abandoned, msgid %d\n", msgid, 0, 0 ); -#else Debug( LDAP_DEBUG_TRACE, "ldap_chkResponseList msg abandoned, msgid %d\n", msgid, 0, 0 ); -#endif ldap_mark_abandoned( ld, lm->lm_msgid ); - if ( lastlm == NULL ) { - /* Remove first entry in list */ - ld->ld_responses = lm->lm_next; - } else { - lastlm->lm_next = nextlm; - } + /* Remove this entry from list */ + *lastlm = nextlm; ldap_msgfree( lm ); @@ -187,17 +169,16 @@ chkResponseList( if ( msgid == LDAP_RES_ANY || lm->lm_msgid == msgid ) { LDAPMessage *tmp; - if ( all == LDAP_MSG_ONE || msgid == LDAP_RES_UNSOLICITED ) { + if ( all == LDAP_MSG_ONE || all == LDAP_MSG_RECEIVED || + msgid == LDAP_RES_UNSOLICITED ) { break; } - for ( tmp = lm; tmp != NULL; tmp = tmp->lm_chain ) { - if ( tmp->lm_msgtype != LDAP_RES_SEARCH_ENTRY - && tmp->lm_msgtype != LDAP_RES_SEARCH_REFERENCE - && tmp->lm_msgtype != LDAP_RES_INTERMEDIATE ) - { - break; - } + tmp = lm->lm_chain_tail; + if ((tmp->lm_msgtype == LDAP_RES_SEARCH_ENTRY) || + (tmp->lm_msgtype == LDAP_RES_SEARCH_REFERENCE) || + (tmp->lm_msgtype == LDAP_RES_INTERMEDIATE)) { + tmp = NULL; } if ( tmp == NULL ) { @@ -206,44 +187,31 @@ chkResponseList( break; } - lastlm = lm; + lastlm = &lm->lm_next; } if ( lm != NULL ) { /* Found an entry, remove it from the list */ - if ( lastlm == NULL ) { - ld->ld_responses = (all == LDAP_MSG_ONE && lm->lm_chain != NULL - ? lm->lm_chain : lm->lm_next); - } else { - lastlm->lm_next = (all == LDAP_MSG_ONE && lm->lm_chain != NULL - ? lm->lm_chain : lm->lm_next); - } if ( all == LDAP_MSG_ONE && lm->lm_chain != NULL ) { - lm->lm_chain->lm_next = lm->lm_next; - lm->lm_chain = NULL; - } + *lastlm = lm->lm_chain; + lm->lm_chain->lm_next = lm->lm_next; + lm->lm_chain->lm_chain_tail = ( lm->lm_chain_tail != lm ) ? lm->lm_chain_tail : lm->lm_chain; + lm->lm_chain = NULL; + lm->lm_chain_tail = NULL; + } else { + *lastlm = lm->lm_next; + } lm->lm_next = NULL; } #ifdef LDAP_DEBUG if( lm == NULL) { -#ifdef NEW_LOGGING - LDAP_LOG ( OPERATION, RESULTS, "ldap_chkResponseList returns NULL\n", - 0, 0, 0 ); -#else Debug( LDAP_DEBUG_TRACE, - "ldap_chkResponseList returns NULL\n", 0, 0, 0); -#endif + "ldap_chkResponseList returns ld %p NULL\n", ld, 0, 0); } else { -#ifdef NEW_LOGGING - LDAP_LOG ( OPERATION, RESULTS, - "ldap_chkResponseList returns msgid %d, type 0x%02lu\n", - lm->lm_msgid, (unsigned long) lm->lm_msgtype, 0 ); -#else Debug( LDAP_DEBUG_TRACE, - "ldap_chkResponseList returns msgid %d, type 0x%02lu\n", - lm->lm_msgid, (unsigned long) lm->lm_msgtype, 0); -#endif + "ldap_chkResponseList returns ld %p msgid %d, type 0x%02lu\n", + ld, lm->lm_msgid, (unsigned long) lm->lm_msgtype); } #endif return lm; @@ -258,7 +226,9 @@ wait4msg( LDAPMessage **result ) { int rc; - struct timeval tv, *tvp; + struct timeval tv = { 0 }, + tv0 = { 0 }, + *tvp; time_t start_time = 0; time_t tmp_time; LDAPConn *lc, *nextlc; @@ -268,28 +238,18 @@ wait4msg( #ifdef LDAP_DEBUG if ( timeout == NULL ) { -#ifdef NEW_LOGGING - LDAP_LOG ( OPERATION, ARGS, - "wait4msg (infinite timeout), msgid %d\n", msgid, 0, 0 ); -#else - Debug( LDAP_DEBUG_TRACE, "wait4msg (infinite timeout), msgid %d\n", - msgid, 0, 0 ); -#endif + Debug( LDAP_DEBUG_TRACE, "wait4msg ld %p msgid %d (infinite timeout)\n", + ld, msgid, 0 ); } else { -#ifdef NEW_LOGGING - LDAP_LOG ( OPERATION, ARGS, - "wait4msg (timeout %ld sec, %ld usec), msgid %d\n", - (long) timeout->tv_sec, (long) timeout->tv_usec, msgid ); -#else - Debug( LDAP_DEBUG_TRACE, "wait4msg (timeout %ld sec, %ld usec), msgid %d\n", - (long) timeout->tv_sec, (long) timeout->tv_usec, msgid ); -#endif + 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 */ if ( timeout == NULL ) { tvp = NULL; } else { + tv0 = *timeout; tv = *timeout; tvp = &tv; start_time = time( NULL ); @@ -298,105 +258,117 @@ wait4msg( rc = -2; while ( rc == -2 ) { #ifdef LDAP_DEBUG -#ifdef NEW_LOGGING - LDAP_LOG ( OPERATION, ARGS, - "wait4msg continue, msgid %d, all %d\n", msgid, all, 0 ); -#else - Debug( LDAP_DEBUG_TRACE, "wait4msg continue, msgid %d, all %d\n", - msgid, all, 0 ); -#endif if ( ldap_debug & LDAP_DEBUG_TRACE ) { + 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 ); } #endif /* LDAP_DEBUG */ - if( (*result = chkResponseList(ld, msgid, all)) != NULL ) { - rc = (*result)->lm_msgtype; - } else { + if ( (*result = chkResponseList(ld, msgid, all)) != NULL ) { + rc = (*result)->lm_msgtype; + + } 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 ); - break; +#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 == NULL ) { - rc = ldap_int_select( ld, tvp ); + if ( !lc_ready ) { + rc = ldap_int_select( ld, tvp ); #ifdef LDAP_DEBUG - if ( rc == -1 ) { -#ifdef NEW_LOGGING - LDAP_LOG ( OPERATION, ARGS, - "wait4msg: ldap_int_select returned -1: errno %d\n", + if ( rc == -1 ) { + Debug( LDAP_DEBUG_TRACE, + "ldap_int_select returned -1: errno %d\n", errno, 0, 0 ); -#else - Debug( LDAP_DEBUG_TRACE, - "ldap_int_select returned -1: errno %d\n", - errno, 0, 0 ); -#endif - } + } #endif - if ( rc == 0 || ( rc == -1 && ( - !LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_RESTART) - || errno != EINTR ))) - { - ld->ld_errno = (rc == -1 ? LDAP_SERVER_DOWN : - LDAP_TIMEOUT); - return( rc ); - } - - if ( rc == -1 ) { - rc = -2; /* select interrupted: loop */ - } else { - rc = -2; + if ( rc == 0 || ( rc == -1 && ( + !LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_RESTART) + || errno != EINTR ))) + { + ld->ld_errno = (rc == -1 ? LDAP_SERVER_DOWN : + LDAP_TIMEOUT); + return( rc ); + } + + if ( rc == -1 ) { + rc = -2; /* select interrupted: loop */ + } else { + rc = -2; #ifdef LDAP_R_COMPILE - ldap_pvt_thread_mutex_lock( &ld->ld_req_mutex ); + ldap_pvt_thread_mutex_lock( &ld->ld_req_mutex ); #endif - if ( ld->ld_requests && + if ( ld->ld_requests && ld->ld_requests->lr_status == LDAP_REQST_WRITING && ldap_is_write_ready( ld, - ld->ld_requests->lr_conn->lconn_sb ) ) { + ld->ld_requests->lr_conn->lconn_sb ) ) + { ldap_int_flush_request( ld, ld->ld_requests ); } #ifdef LDAP_R_COMPILE - ldap_pvt_thread_mutex_unlock( &ld->ld_req_mutex ); + 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 ) + { + nextlc = lc->lconn_next; + 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 - for ( lc = ld->ld_conns; rc == -2 && lc != NULL; - lc = nextlc ) { - nextlc = lc->lconn_next; - if ( lc->lconn_status == - LDAP_CONNST_CONNECTED && - ldap_is_read_ready( ld, - lc->lconn_sb )) { - rc = try_read1msg( ld, msgid, all, - lc->lconn_sb, &lc, result ); - if ( lc == NULL ) lc = nextlc; - } - } - } - } + } + } } if ( rc == -2 && tvp != NULL ) { tmp_time = time( NULL ); - if (( tv.tv_sec -= ( tmp_time - start_time )) <= 0 ) { + tv0.tv_sec -= ( tmp_time - start_time ); + if ( tv0.tv_sec <= 0 ) { rc = 0; /* timed out */ ld->ld_errno = LDAP_TIMEOUT; break; } + tv.tv_sec = tv0.tv_sec; -#ifdef NEW_LOGGING - LDAP_LOG ( OPERATION, DETAIL1, - "wait4msg: %ld secs to go\n", (long) tv.tv_sec, 0, 0 ); -#else - Debug( LDAP_DEBUG_TRACE, "wait4msg: %ld secs to go\n", - (long) tv.tv_sec, 0, 0 ); -#endif + Debug( LDAP_DEBUG_TRACE, "wait4msg ld %p %ld secs to go\n", + ld, (long) tv.tv_sec, 0 ); start_time = tmp_time; } } @@ -415,7 +387,7 @@ try_read1msg( LDAPMessage **result ) { BerElement *ber; - LDAPMessage *new, *l, *prev, *tmp; + LDAPMessage *newmsg, *l, *prev; ber_int_t id; ber_tag_t tag; ber_len_t len; @@ -425,24 +397,27 @@ try_read1msg( BerElement tmpber; int rc, refer_cnt, hadref, simple_request; ber_int_t lderr; + #ifdef LDAP_CONNECTIONLESS - int firstmsg = 1, moremsgs = 0, isv2 = 0; + LDAPMessage *tmp = NULL, *chain_head = NULL; + int moremsgs = 0, isv2 = 0; #endif + /* * v3ref = flag for V3 referral / search reference * 0 = not a ref, 1 = sucessfully chased ref, -1 = pass ref to application */ - int v3ref; + enum { + V3REF_NOREF = 0, + V3REF_SUCCESS = 1, + V3REF_TOAPP = -1 + } v3ref; assert( ld != NULL ); assert( lcp != NULL ); assert( *lcp != NULL ); -#ifdef NEW_LOGGING - LDAP_LOG ( OPERATION, ARGS, "read1msg: msgid %d, all %d\n", msgid, all, 0 ); -#else - Debug( LDAP_DEBUG_TRACE, "read1msg: msgid %d, all %d\n", msgid, all, 0 ); -#endif + Debug( LDAP_DEBUG_TRACE, "read1msg: ld %p msgid %d all %d\n", ld, msgid, all ); lc = *lcp; @@ -479,14 +454,9 @@ nextresp3: if ( tag != LDAP_TAG_MESSAGE ) { if ( tag == LBER_DEFAULT) { #ifdef LDAP_DEBUG -#ifdef NEW_LOGGING - LDAP_LOG ( OPERATION, DETAIL1, - "read1msg: ber_get_next failed\n", 0, 0, 0 ); -#else Debug( LDAP_DEBUG_CONNS, "ber_get_next failed.\n", 0, 0, 0 ); #endif -#endif #ifdef EWOULDBLOCK if (errno==EWOULDBLOCK) return -2; #endif @@ -509,11 +479,8 @@ nextresp3: /* if it's been abandoned, toss it */ if ( ldap_abandoned( ld, id ) ) { -#ifdef NEW_LOGGING - LDAP_LOG ( OPERATION, DETAIL1, "read1msg: abandoned\n", 0, 0, 0 ); -#else - Debug( LDAP_DEBUG_ANY, "abandoned\n", 0, 0, 0); -#endif + 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 ) ) { @@ -522,16 +489,11 @@ retry_ber: return( -2 ); /* continue looking */ } - if (( lr = ldap_find_request_by_msgid( ld, id )) == NULL ) { -#ifdef NEW_LOGGING - LDAP_LOG ( OPERATION, DETAIL1, - "read1msg: no request for response with msgid %ld (tossing)\n", - (long) id, 0, 0 ); -#else + 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 ); -#endif + "no request for response on ld %p msgid %ld (tossing)\n", + ld, (long) id, 0 ); goto retry_ber; } #ifdef LDAP_CONNECTIONLESS @@ -547,17 +509,9 @@ nextresp2: return( -1 ); } -#ifdef NEW_LOGGING - LDAP_LOG ( OPERATION, DETAIL1, - "read1msg: ldap_read: message type %s msgid %ld, original id %ld\n", - ldap_int_msgtype2str( tag ), - (long) lr->lr_msgid, (long) lr->lr_origid ); -#else 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 ); -#endif + "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; @@ -569,15 +523,16 @@ nextresp2: * This code figures out if we are going to chase a * referral / search reference, or pass it back to the application */ - v3ref = 0; /* Assume not a V3 search reference or referral */ + v3ref = V3REF_NOREF; /* Assume not a V3 search reference/referral */ if( (tag != LDAP_RES_SEARCH_ENTRY) && (ld->ld_version > LDAP_VERSION2) ) { BerElement tmpber = *ber; /* struct copy */ char **refs = NULL; - if( tag == LDAP_RES_SEARCH_REFERENCE) { + if( tag == LDAP_RES_SEARCH_REFERENCE ) { /* This is a V3 search reference */ - /* Assume we do not chase the reference, but pass it to application */ - v3ref = -1; + /* Assume we do not chase the reference, + * but pass it to application */ + v3ref = V3REF_TOAPP; if( LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_REFERRALS) || (lr->lr_parent != NULL) ) { @@ -585,56 +540,62 @@ nextresp2: if ( ber_scanf( &tmpber, "{v}", &refs ) == LBER_ERROR ) { rc = LDAP_DECODING_ERROR; } else { - /* Note: refs arrary is freed by ldap_chase_v3referrals */ + /* Note: refs array is freed by ldap_chase_v3referrals */ refer_cnt = ldap_chase_v3referrals( ld, lr, refs, 1, &lr->lr_res_error, &hadref ); - if ( refer_cnt > 0 ) { /* sucessfully chased reference */ + if ( refer_cnt > 0 ) { + /* sucessfully chased reference */ /* If haven't got end search, set chasing referrals */ if( lr->lr_status != LDAP_REQST_COMPLETED) { lr->lr_status = LDAP_REQST_CHASINGREFS; -#ifdef NEW_LOGGING - LDAP_LOG ( OPERATION, DETAIL1, - "read1msg: search ref chased," - "mark request chasing refs, id = %d\n", - lr->lr_msgid, 0, 0 ); -#else Debug( LDAP_DEBUG_TRACE, - "read1msg: search ref chased, mark request chasing refs, id = %d\n", - lr->lr_msgid, 0, 0); -#endif + "read1msg: search ref chased, " + "mark request chasing refs, " + "id = %d\n", + lr->lr_msgid, 0, 0); } - v3ref = 1; /* We sucessfully chased the reference */ + + /* We sucessfully chased the reference */ + v3ref = V3REF_SUCCESS; } } } } else { /* Check for V3 referral */ - ber_len_t len; - if ( ber_scanf( &tmpber, "{iaa",/*}*/ &lderr, - &lr->lr_res_matched, &lr->lr_res_error ) - != LBER_ERROR ) { + ber_len_t len; + char *lr_res_error = NULL; + + if ( ber_scanf( &tmpber, "{eaa",/*}*/ &lderr, + &lr->lr_res_matched, &lr_res_error ) + != LBER_ERROR ) + { + if ( lr_res_error != NULL ) { + if ( lr->lr_res_error != NULL ) { + (void)ldap_append_referral( ld, &lr->lr_res_error, lr_res_error ); + LDAP_FREE( (char *)lr_res_error ); + + } else { + lr->lr_res_error = lr_res_error; + } + } + /* Check if V3 referral */ - if( ber_peek_tag( &tmpber, &len) == LDAP_TAG_REFERRAL ) { + if ( ber_peek_tag( &tmpber, &len ) == LDAP_TAG_REFERRAL ) { /* We have a V3 referral, assume we cannot chase it */ - v3ref = -1; + v3ref = V3REF_TOAPP; if( LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_REFERRALS) || (lr->lr_parent != NULL) ) { - v3ref = -1; /* Assume referral not chased and return it to app */ + /* Assume referral not chased and return it to app */ + v3ref = V3REF_TOAPP; + /* Get the referral list */ if( ber_scanf( &tmpber, "{v}", &refs) == LBER_ERROR) { rc = LDAP_DECODING_ERROR; lr->lr_status = LDAP_REQST_COMPLETED; -#ifdef NEW_LOGGING - LDAP_LOG ( OPERATION, DETAIL1, - "read1msg: referral decode error," - "mark request completed, id = %d\n", - lr->lr_msgid, 0, 0 ); -#else Debug( LDAP_DEBUG_TRACE, - "read1msg: referral decode error, mark request completed, id = %d\n", - lr->lr_msgid, 0, 0); -#endif + "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 @@ -642,18 +603,12 @@ nextresp2: refer_cnt = ldap_chase_v3referrals( ld, lr, refs, 0, &lr->lr_res_error, &hadref ); lr->lr_status = LDAP_REQST_COMPLETED; -#ifdef NEW_LOGGING - LDAP_LOG ( OPERATION, DETAIL1, - "read1msg: referral chased," - "mark request completed, id = %d\n", - lr->lr_msgid, 0, 0 ); -#else Debug( LDAP_DEBUG_TRACE, - "read1msg: referral chased, mark request completed, id = %d\n", - lr->lr_msgid, 0, 0); -#endif + "read1msg: referral chased, mark request completed, ld %p msgid %d\n", + ld, lr->lr_msgid, 0); if( refer_cnt > 0) { - v3ref = 1; /* Referral successfully chased */ + /* Referral successfully chased */ + v3ref = V3REF_SUCCESS; } } } @@ -675,7 +630,7 @@ nextresp2: * go through the following code. This code also chases V2 referrals * and checks if all referrals have been chased. */ - if ( (tag != LDAP_RES_SEARCH_ENTRY) && (v3ref > -1) && + if ( (tag != LDAP_RES_SEARCH_ENTRY) && (v3ref != V3REF_TOAPP) && (tag != LDAP_RES_INTERMEDIATE )) { /* For a v3 search referral/reference, only come here if already chased it */ @@ -683,8 +638,10 @@ nextresp2: ( lr->lr_parent != NULL || LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_REFERRALS) ) ) { + char *lr_res_error = NULL; + tmpber = *ber; /* struct copy */ - if ( v3ref == 1 ) { + if ( v3ref == V3REF_SUCCESS ) { /* V3 search reference or V3 referral * sucessfully chased. If this message * is a search result, then it has no more @@ -692,23 +649,42 @@ nextresp2: */ if ( tag == LDAP_RES_SEARCH_RESULT ) refer_cnt = 0; - } else if ( ber_scanf( &tmpber, "{iaa}", &lderr, - &lr->lr_res_matched, &lr->lr_res_error ) - != LBER_ERROR ) { - if ( lderr != LDAP_SUCCESS ) { + } else if ( ber_scanf( &tmpber, "{eaa}", &lderr, + &lr->lr_res_matched, &lr_res_error ) + != LBER_ERROR ) + { + if ( lr_res_error != NULL ) { + if ( lr->lr_res_error != NULL ) { + (void)ldap_append_referral( ld, &lr->lr_res_error, lr_res_error ); + LDAP_FREE( (char *)lr_res_error ); + } else { + lr->lr_res_error = lr_res_error; + } + lr_res_error = NULL; + } + + switch ( lderr ) { + case LDAP_SUCCESS: + case LDAP_COMPARE_TRUE: + case LDAP_COMPARE_FALSE: + break; + + default: + if ( lr->lr_res_error == NULL + || lr->lr_res_error[ 0 ] == '\0' ) + { + break; + } + /* referrals are in error string */ refer_cnt = ldap_chase_referrals( ld, lr, &lr->lr_res_error, -1, &hadref ); lr->lr_status = LDAP_REQST_COMPLETED; -#ifdef NEW_LOGGING - LDAP_LOG ( OPERATION, DETAIL1, - "read1msg: V2 referral chased," - "mark request completed, id = %d\n", - lr->lr_msgid, 0, 0 ); -#else Debug( LDAP_DEBUG_TRACE, - "read1msg: V2 referral chased, mark request completed, id = %d\n", lr->lr_msgid, 0, 0); -#endif + "read1msg: V2 referral chased, " + "mark request completed, id = %d\n", + lr->lr_msgid, 0, 0 ); + break; } /* save errno, message, and matched string */ @@ -721,27 +697,15 @@ nextresp2: } else { lr->lr_res_errno = LDAP_PARTIAL_RESULTS; } -#ifdef NEW_LOGGING -LDAP_LOG ( OPERATION, DETAIL1, - "read1msg: new result: res_errno: %d, res_error: <%s>, res_matched: <%s>\n", - lr->lr_res_errno, lr->lr_res_error ? lr->lr_res_error : "", - lr->lr_res_matched ? lr->lr_res_matched : "" ); -#else Debug( LDAP_DEBUG_TRACE, "new result: res_errno: %d, res_error: <%s>, res_matched: <%s>\n", lr->lr_res_errno, lr->lr_res_error ? lr->lr_res_error : "", lr->lr_res_matched ? lr->lr_res_matched : "" ); -#endif } } -#ifdef NEW_LOGGING - LDAP_LOG ( OPERATION, DETAIL1, "read1msg: %d new referrals\n", - refer_cnt, 0, 0 ); -#else Debug( LDAP_DEBUG_TRACE, - "read1msg: %d new referrals\n", refer_cnt, 0, 0 ); -#endif + "read1msg: ld %p %d new referrals\n", ld, refer_cnt, 0 ); if ( refer_cnt != 0 ) { /* chasing referrals */ ber_free( ber, 1 ); @@ -761,14 +725,8 @@ Debug( LDAP_DEBUG_TRACE, } lr->lr_status = LDAP_REQST_COMPLETED; /* declare this request done */ -#ifdef NEW_LOGGING - LDAP_LOG ( OPERATION, DETAIL1, - "read1msg: mark request completed, id = %d\n", - lr->lr_msgid, 0, 0 ); -#else Debug( LDAP_DEBUG_TRACE, - "read1msg: mark request completed, id = %d\n", lr->lr_msgid, 0, 0); -#endif + "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 ); @@ -781,32 +739,26 @@ Debug( LDAP_DEBUG_TRACE, /* Check if all requests are finished, lr is now parent */ tmplr = lr; if (tmplr->lr_status == LDAP_REQST_COMPLETED) { - for(tmplr=lr->lr_child; tmplr != NULL; tmplr=tmplr->lr_refnext) { - if( tmplr->lr_status != LDAP_REQST_COMPLETED) { - break; - } + for ( tmplr=lr->lr_child; + tmplr != NULL; + tmplr=tmplr->lr_refnext) + { + if( tmplr->lr_status != LDAP_REQST_COMPLETED) break; } } /* This is the parent request if the request has referrals */ - if ( lr->lr_outrefcnt <= 0 && lr->lr_parent == NULL && tmplr == NULL ) { + if ( lr->lr_outrefcnt <= 0 && lr->lr_parent == NULL && + tmplr == NULL ) + { id = lr->lr_msgid; tag = lr->lr_res_msgtype; -#ifdef NEW_LOGGING - LDAP_LOG ( OPERATION, DETAIL1, - "read1msg: request %ld done\n", (long) id, 0, 0 ); - LDAP_LOG ( OPERATION, DETAIL1, - "read1msg: res_errno: %d,res_error: <%s>, res_matched: <%s>\n", - lr->lr_res_errno, lr->lr_res_error ? lr->lr_res_error : "", - lr->lr_res_matched ? lr->lr_res_matched : "" ); -#else - 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 : "", lr->lr_res_matched ? lr->lr_res_matched : "" ); -#endif if ( !simple_request ) { ber_free( ber, 1 ); ber = NULL; @@ -816,11 +768,23 @@ lr->lr_res_matched ? lr->lr_res_matched : "" ); } } +#ifdef LDAP_R_COMPILE + ldap_pvt_thread_mutex_lock( &ld->ld_req_mutex ); +#endif ldap_free_request( ld, lr ); +#ifdef LDAP_R_COMPILE + ldap_pvt_thread_mutex_unlock( &ld->ld_req_mutex ); +#endif } if ( lc != NULL ) { +#ifdef LDAP_R_COMPILE + ldap_pvt_thread_mutex_lock( &ld->ld_req_mutex ); +#endif ldap_free_connection( ld, lc, 0, 1 ); +#ifdef LDAP_R_COMPILE + ldap_pvt_thread_mutex_unlock( &ld->ld_req_mutex ); +#endif *lcp = NULL; } } @@ -831,14 +795,15 @@ lr->lr_res_matched ? lr->lr_res_matched : "" ); } /* make a new ldap message */ - if ( (new = (LDAPMessage *) LDAP_CALLOC( 1, sizeof(LDAPMessage) )) - == NULL ) { + newmsg = (LDAPMessage *) LDAP_CALLOC( 1, sizeof(LDAPMessage) ); + if ( newmsg == NULL ) { ld->ld_errno = LDAP_NO_MEMORY; return( -1 ); } - new->lm_msgid = (int)id; - new->lm_msgtype = tag; - new->lm_ber = ber; + newmsg->lm_msgid = (int)id; + newmsg->lm_msgtype = tag; + newmsg->lm_ber = ber; + newmsg->lm_chain_tail = newmsg; #ifdef LDAP_CONNECTIONLESS /* CLDAP replies all fit in a single datagram. In LDAPv2 RFC1798 @@ -885,14 +850,15 @@ lr->lr_res_matched ? lr->lr_res_matched : "" ); if (ber_sockbuf_ctrl(sb, LBER_SB_OPT_DATA_READY, NULL)) ok=1; } /* set up response chain */ - if ( firstmsg ) { - firstmsg = 0; - new->lm_next = ld->ld_responses; - ld->ld_responses = new; + if ( tmp == NULL ) { + newmsg->lm_next = ld->ld_responses; + ld->ld_responses = newmsg; + chain_head = newmsg; } else { - tmp->lm_chain = new; + tmp->lm_chain = newmsg; } - tmp = new; + chain_head->lm_chain_tail = newmsg; + tmp = newmsg; /* "ok" means there's more to parse */ if (ok) { if (isv2) goto nextresp2; @@ -911,24 +877,25 @@ lr->lr_res_matched ? lr->lr_res_matched : "" ); * stick the result onto the end of the chain, and then pull the * first response off the head of the chain. */ - tmp->lm_chain = new; + tmp->lm_chain = newmsg; + chain_head->lm_chain_tail = newmsg; *result = chkResponseList( ld, msgid, all ); ld->ld_errno = LDAP_SUCCESS; return( (*result)->lm_msgtype ); } } -#endif +#endif /* LDAP_CONNECTIONLESS */ /* is this the one we're looking for? */ if ( msgid == LDAP_RES_ANY || id == msgid ) { if ( all == LDAP_MSG_ONE - || (new->lm_msgtype != LDAP_RES_SEARCH_RESULT - && new->lm_msgtype != LDAP_RES_SEARCH_ENTRY - && new->lm_msgtype != LDAP_RES_SEARCH_REFERENCE) ) { - *result = new; + || (newmsg->lm_msgtype != LDAP_RES_SEARCH_RESULT + && newmsg->lm_msgtype != LDAP_RES_SEARCH_ENTRY + && newmsg->lm_msgtype != LDAP_RES_SEARCH_REFERENCE) ) { + *result = newmsg; ld->ld_errno = LDAP_SUCCESS; return( tag ); - } else if ( new->lm_msgtype == LDAP_RES_SEARCH_RESULT) { + } else if ( newmsg->lm_msgtype == LDAP_RES_SEARCH_RESULT) { foundit = 1; /* return the chain later */ } } @@ -941,7 +908,7 @@ lr->lr_res_matched ? lr->lr_res_matched : "" ); prev = NULL; for ( l = ld->ld_responses; l != NULL; l = l->lm_next ) { - if ( l->lm_msgid == new->lm_msgid ) + if ( l->lm_msgid == newmsg->lm_msgid ) break; prev = l; } @@ -949,32 +916,21 @@ lr->lr_res_matched ? lr->lr_res_matched : "" ); /* not part of an existing search response */ if ( l == NULL ) { if ( foundit ) { - *result = new; + *result = newmsg; goto exit; } - new->lm_next = ld->ld_responses; - ld->ld_responses = new; + newmsg->lm_next = ld->ld_responses; + ld->ld_responses = newmsg; goto exit; } -#ifdef NEW_LOGGING - LDAP_LOG ( OPERATION, DETAIL1, - "read1msg: adding response id %ld type %ld\n", - (long) new->lm_msgid, (long) new->lm_msgtype, 0 ); -#else - Debug( LDAP_DEBUG_TRACE, "adding response id %ld type %ld:\n", - (long) new->lm_msgid, (long) new->lm_msgtype, 0 ); -#endif + 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 */ - for ( tmp = l; (tmp->lm_chain != NULL) && - ((tmp->lm_chain->lm_msgtype == LDAP_RES_SEARCH_ENTRY) || - (tmp->lm_chain->lm_msgtype == LDAP_RES_SEARCH_REFERENCE) || - (tmp->lm_chain->lm_msgtype == LDAP_RES_INTERMEDIATE )); - tmp = tmp->lm_chain ) - ; /* NULL */ - tmp->lm_chain = new; + l->lm_chain_tail->lm_chain = newmsg; + l->lm_chain_tail = newmsg; /* return the whole chain if that's what we were looking for */ if ( foundit ) { @@ -1014,10 +970,10 @@ build_result_ber( LDAP *ld, BerElement **bp, LDAPRequest *lr ) } if ( ber_printf( ber, "{it{ess}}", lr->lr_msgid, - lr->lr_res_msgtype, lr->lr_res_errno, - lr->lr_res_matched ? lr->lr_res_matched : "", - lr->lr_res_error ? lr->lr_res_error : "" ) == -1 ) { - + lr->lr_res_msgtype, lr->lr_res_errno, + lr->lr_res_matched ? lr->lr_res_matched : "", + lr->lr_res_error ? lr->lr_res_error : "" ) == -1 ) + { ld->ld_errno = LDAP_ENCODING_ERROR; ber_free(ber, 1); return( LBER_ERROR ); @@ -1031,7 +987,7 @@ build_result_ber( LDAP *ld, BerElement **bp, LDAPRequest *lr ) return( LBER_ERROR ); } - if ( ber_get_int( ber, &along ) == LBER_ERROR ) { + if ( ber_get_enum( ber, &along ) == LBER_ERROR ) { ld->ld_errno = LDAP_DECODING_ERROR; ber_free(ber, 1); return( LBER_ERROR ); @@ -1063,14 +1019,15 @@ merge_error_info( LDAP *ld, LDAPRequest *parentr, LDAPRequest *lr ) lr->lr_res_error ); } } else if ( lr->lr_res_errno != LDAP_SUCCESS && - parentr->lr_res_errno == LDAP_SUCCESS ) { + parentr->lr_res_errno == LDAP_SUCCESS ) + { parentr->lr_res_errno = lr->lr_res_errno; if ( parentr->lr_res_error != NULL ) { LDAP_FREE( parentr->lr_res_error ); } parentr->lr_res_error = lr->lr_res_error; lr->lr_res_error = NULL; - if ( LDAP_NAME_ERROR( lr->lr_res_errno )) { + if ( LDAP_NAME_ERROR( lr->lr_res_errno ) ) { if ( parentr->lr_res_matched != NULL ) { LDAP_FREE( parentr->lr_res_matched ); } @@ -1079,21 +1036,12 @@ merge_error_info( LDAP *ld, LDAPRequest *parentr, LDAPRequest *lr ) } } -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, DETAIL1, "merged parent (id %d) error info: ", - parentr->lr_msgid, 0, 0 ); - LDAP_LOG( OPERATION, DETAIL1, "result errno %d, error <%s>, matched <%s>\n", - parentr->lr_res_errno, parentr->lr_res_error ? - parentr->lr_res_error : "", parentr->lr_res_matched ? - parentr->lr_res_matched : "" ); -#else Debug( LDAP_DEBUG_TRACE, "merged parent (id %d) error info: ", parentr->lr_msgid, 0, 0 ); Debug( LDAP_DEBUG_TRACE, "result errno %d, error <%s>, matched <%s>\n", parentr->lr_res_errno, parentr->lr_res_error ? parentr->lr_res_error : "", parentr->lr_res_matched ? parentr->lr_res_matched : "" ); -#endif } @@ -1102,7 +1050,7 @@ int ldap_msgtype( LDAPMessage *lm ) { assert( lm != NULL ); - return ( lm != NULL ) ? lm->lm_msgtype : -1; + return ( lm != NULL ) ? (int)lm->lm_msgtype : -1; } @@ -1139,11 +1087,7 @@ ldap_msgfree( LDAPMessage *lm ) LDAPMessage *next; int type = 0; -#ifdef NEW_LOGGING - LDAP_LOG ( OPERATION, ENTRY, "ldap_msgfree\n", 0, 0, 0 ); -#else Debug( LDAP_DEBUG_TRACE, "ldap_msgfree\n", 0, 0, 0 ); -#endif for ( ; lm != NULL; lm = next ) { next = lm->lm_chain; @@ -1168,11 +1112,7 @@ ldap_msgdelete( LDAP *ld, int msgid ) assert( ld != NULL ); -#ifdef NEW_LOGGING - LDAP_LOG ( OPERATION, ENTRY, "ldap_msgdelete\n", 0, 0, 0 ); -#else Debug( LDAP_DEBUG_TRACE, "ldap_msgdelete\n", 0, 0, 0 ); -#endif prev = NULL; #ifdef LDAP_R_COMPILE