X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fresult.c;h=8b03df7697467b60834a69e9bf494f154526892f;hb=c8e37af0ca8302c276e8c6af84eca4f926171261;hp=48fdcc2c22deaee604da4721cd7ed51344cf53ec;hpb=9c2ebd1f4244aa98b29d9391816003f1f62817e2;p=openldap diff --git a/libraries/libldap/result.c b/libraries/libldap/result.c index 48fdcc2c22..8b03df7697 100644 --- a/libraries/libldap/result.c +++ b/libraries/libldap/result.c @@ -9,10 +9,23 @@ * result.c - wait for an ldap result */ +/* + * LDAPv3 (RFC2251) + * LDAPResult ::= SEQUENCE { + * resultCode ENUMERATED { ... }, + * matchedDN LDAPDN, + * errorMessage LDAPString, + * referral Referral OPTIONAL + * } + * Referral ::= SEQUENCE OF LDAPURL (one or more) + * LDAPURL ::= LDAPString (limited to URL chars) + */ + #include "portable.h" #include -#include + +#include #include #include @@ -23,22 +36,14 @@ #include "ldap-int.h" -static int ldap_abandoned LDAP_P(( LDAP *ld, int msgid )); -static int ldap_mark_abandoned LDAP_P(( LDAP *ld, int msgid )); -static int wait4msg LDAP_P(( LDAP *ld, int msgid, int all, struct timeval *timeout, - LDAPMessage **result )); -#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS -static int try_read1msg LDAP_P(( LDAP *ld, int msgid, int all, Sockbuf *sb, LDAPConn *lc, +static int ldap_abandoned LDAP_P(( LDAP *ld, ber_int_t msgid )); +static int ldap_mark_abandoned LDAP_P(( LDAP *ld, ber_int_t msgid )); +static int wait4msg LDAP_P(( LDAP *ld, ber_int_t msgid, int all, struct timeval *timeout, LDAPMessage **result )); -static unsigned long build_result_ber LDAP_P(( LDAP *ld, BerElement *ber, LDAPRequest *lr )); +static ber_tag_t try_read1msg LDAP_P(( LDAP *ld, ber_int_t msgid, + int all, Sockbuf *sb, LDAPConn *lc, LDAPMessage **result )); +static ber_tag_t build_result_ber LDAP_P(( LDAP *ld, BerElement **bp, LDAPRequest *lr )); static void merge_error_info LDAP_P(( LDAP *ld, LDAPRequest *parentr, LDAPRequest *lr )); -#else /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */ -static int try_read1msg LDAP_P(( LDAP *ld, int msgid, int all, Sockbuf *sb, - LDAPMessage **result )); -#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */ -#if defined( LDAP_CONNECTIONLESS ) || !defined( LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS ) -static int ldap_select1 LDAP_P(( LDAP *ld, struct timeval *timeout )); -#endif /* @@ -56,7 +61,11 @@ static int ldap_select1 LDAP_P(( LDAP *ld, struct timeval *timeout )); * ldap_result( s, msgid, all, timeout, result ) */ int -ldap_result( LDAP *ld, int msgid, int all, struct timeval *timeout, +ldap_result( + LDAP *ld, + int msgid, + int all, + struct timeval *timeout, LDAPMessage **result ) { LDAPMessage *lm, *lastlm, *nextlm; @@ -82,15 +91,15 @@ ldap_result( LDAP *ld, int msgid, int all, struct timeval *timeout, * wait until it arrives or timeout occurs. */ - *result = NULLMSG; - lastlm = NULLMSG; - for ( lm = ld->ld_responses; lm != NULLMSG; lm = nextlm ) { + *result = NULL; + lastlm = NULL; + for ( lm = ld->ld_responses; lm != NULL; lm = nextlm ) { nextlm = lm->lm_next; if ( ldap_abandoned( ld, lm->lm_msgid ) ) { ldap_mark_abandoned( ld, lm->lm_msgid ); - if ( lastlm == NULLMSG ) { + if ( lastlm == NULL ) { ld->ld_responses = lm->lm_next; } else { lastlm->lm_next = nextlm; @@ -110,34 +119,33 @@ ldap_result( LDAP *ld, int msgid, int all, struct timeval *timeout, && lm->lm_msgtype != LDAP_RES_SEARCH_ENTRY) ) break; - for ( tmp = lm; tmp != NULLMSG; tmp = tmp->lm_chain ) { + for ( tmp = lm; tmp != NULL; tmp = tmp->lm_chain ) { if ( tmp->lm_msgtype == LDAP_RES_SEARCH_RESULT ) break; } - if ( tmp == NULLMSG ) { - return( wait4msg( ld, msgid, all, timeout, - result ) ); + if ( tmp == NULL ) { + lm = NULL; } break; } lastlm = lm; } - if ( lm == NULLMSG ) { + if ( lm == NULL ) { return( wait4msg( ld, msgid, all, timeout, result ) ); } - if ( lastlm == NULLMSG ) { - ld->ld_responses = (all == 0 && lm->lm_chain != NULLMSG + if ( lastlm == NULL ) { + ld->ld_responses = (all == 0 && lm->lm_chain != NULL ? lm->lm_chain : lm->lm_next); } else { - lastlm->lm_next = (all == 0 && lm->lm_chain != NULLMSG + lastlm->lm_next = (all == 0 && lm->lm_chain != NULL ? lm->lm_chain : lm->lm_next); } if ( all == 0 ) - lm->lm_chain = NULLMSG; - lm->lm_next = NULLMSG; + lm->lm_chain = NULL; + lm->lm_next = NULL; *result = lm; ld->ld_errno = LDAP_SUCCESS; @@ -145,16 +153,18 @@ ldap_result( LDAP *ld, int msgid, int all, struct timeval *timeout, } static int -wait4msg( LDAP *ld, int msgid, int all, struct timeval *timeout, +wait4msg( + LDAP *ld, + ber_int_t msgid, + int all, + struct timeval *timeout, LDAPMessage **result ) { int rc; struct timeval tv, *tvp; time_t start_time = 0; time_t tmp_time; -#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS LDAPConn *lc, *nextlc; -#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */ assert( ld != NULL ); assert( result != NULL ); @@ -179,27 +189,6 @@ wait4msg( LDAP *ld, int msgid, int all, struct timeval *timeout, rc = -2; while ( rc == -2 ) { -#ifndef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS - /* hack attack */ - if ( ! ber_pvt_sb_data_ready(&ld->ld_sb) ) { - rc = ldap_select1( ld, tvp ); - - if ( rc == 0 || ( rc == -1 && ( - ( LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_RESTART) - == LDAP_OPT_OFF ) - || errno != EINTR ))) { - ld->ld_errno = (rc == -1 ? LDAP_SERVER_DOWN : - LDAP_TIMEOUT); - return( rc ); - } - - } - if ( rc == -1 ) { - rc = -2; /* select interrupted: loop */ - } else { - rc = try_read1msg( ld, msgid, all, &ld->ld_sb, result ); - } -#else /* !LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */ #ifdef LDAP_DEBUG if ( ldap_debug & LDAP_DEBUG_TRACE ) { ldap_dump_connection( ld, ld->ld_conns, 1 ); @@ -227,8 +216,7 @@ wait4msg( LDAP *ld, int msgid, int all, struct timeval *timeout, #endif if ( rc == 0 || ( rc == -1 && ( - ( LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_RESTART) - == LDAP_OPT_OFF ) + !LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_RESTART) || errno != EINTR ))) { ld->ld_errno = (rc == -1 ? LDAP_SERVER_DOWN : @@ -253,7 +241,6 @@ wait4msg( LDAP *ld, int msgid, int all, struct timeval *timeout, } } } -#endif /* !LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */ if ( rc == -2 && tvp != NULL ) { tmp_time = time( NULL ); @@ -273,42 +260,44 @@ wait4msg( LDAP *ld, int msgid, int all, struct timeval *timeout, } -static int -try_read1msg( LDAP *ld, int msgid, int all, Sockbuf *sb, -#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS +static ber_tag_t +try_read1msg( + LDAP *ld, + ber_int_t msgid, + int all, + Sockbuf *sb, LDAPConn *lc, -#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */ - LDAPMessage **result ) + LDAPMessage **result ) { BerElement *ber; LDAPMessage *new, *l, *prev, *tmp; - long id; - unsigned long tag, len; + ber_int_t id; + ber_tag_t tag; + ber_len_t len; int foundit = 0; -#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS LDAPRequest *lr; BerElement tmpber; int rc, refer_cnt, hadref, simple_request; - unsigned long lderr; + ber_int_t lderr; assert( ld != NULL ); assert( lc != NULL ); - ber = &lc->lconn_ber; + Debug( LDAP_DEBUG_TRACE, "read1msg\n", 0, 0, 0 ); -#else - assert( ld != NULL ); + if ( lc->lconn_ber == NULL ) { + lc->lconn_ber = ldap_alloc_ber_with_options(ld); - ber = &ld->ld_ber; -#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */ + if( lc->lconn_ber == NULL ) { + return -1; + } + } - Debug( LDAP_DEBUG_TRACE, "read1msg\n", 0, 0, 0 ); + ber = lc->lconn_ber; + assert( BER_VALID (ber) ); -#if 0 - ber_init_w_nullc( &ber, 0 ); - ldap_set_ber_options( ld, &ber ); -#endif /* get the next message */ + errno = 0; if ( (tag = ber_get_next( sb, &len, ber )) != LDAP_TAG_MESSAGE ) { if ( tag == LBER_DEFAULT) { @@ -329,40 +318,46 @@ try_read1msg( LDAP *ld, int msgid, int all, Sockbuf *sb, return -1; } + /* + * We read a complete message. + * The connection should no longer need this ber. + */ + lc->lconn_ber = NULL; + /* message id */ if ( ber_get_int( ber, &id ) == LBER_ERROR ) { + ber_free( ber, 1 ); ld->ld_errno = LDAP_DECODING_ERROR; return( -1 ); } /* if it's been abandoned, toss it */ - if ( ldap_abandoned( ld, (int)id ) ) { - ber_clear( ber, 1 ); /* gack! */ + if ( ldap_abandoned( ld, id ) ) { + ber_free( ber, 1 ); return( -2 ); /* continue looking */ } -#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS if (( lr = ldap_find_request_by_msgid( ld, id )) == NULL ) { Debug( LDAP_DEBUG_ANY, "no request for response with msgid %ld (tossing)\n", id, 0, 0 ); - ber_clear( ber, 1 ); /* gack! */ + ber_free( ber, 1 ); return( -2 ); /* continue looking */ } - Debug( LDAP_DEBUG_TRACE, "ldap_read: %s msgid %ld, original id %d\n", - ( tag == LDAP_RES_SEARCH_ENTRY ) ? "entry" : - ( tag == LDAP_RES_SEARCH_REFERENCE ) ? "reference" : "result", - id, lr->lr_origid ); - id = lr->lr_origid; -#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */ /* the message type */ if ( (tag = ber_peek_tag( ber, &len )) == LBER_ERROR ) { ld->ld_errno = LDAP_DECODING_ERROR; + ber_free( ber, 1 ); return( -1 ); } -#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS + Debug( LDAP_DEBUG_TRACE, "ldap_read: %s msgid %ld, original id %d\n", + ( tag == LDAP_RES_SEARCH_ENTRY ) ? "entry" : + ( tag == LDAP_RES_SEARCH_REFERENCE ) ? "reference" : "result", + id, lr->lr_origid ); + + id = lr->lr_origid; refer_cnt = 0; hadref = simple_request = 0; rc = -2; /* default is to keep looking (no response found) */ @@ -371,8 +366,7 @@ try_read1msg( LDAP *ld, int msgid, int all, Sockbuf *sb, if ( tag != LDAP_RES_SEARCH_ENTRY ) { if ( ld->ld_version >= LDAP_VERSION2 && ( lr->lr_parent != NULL || - ( LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_REFERRALS) - != LDAP_OPT_OFF ) ) ) + LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_REFERRALS) ) ) { tmpber = *ber; /* struct copy */ if ( ber_scanf( &tmpber, "{iaa}", &lderr, @@ -405,7 +399,8 @@ Debug( LDAP_DEBUG_TRACE, "read1msg: %d new referrals\n", refer_cnt, 0, 0 ); if ( refer_cnt != 0 ) { /* chasing referrals */ - ber_clear( ber, 1 ); /* gack! */ + ber_free( ber, 1 ); + ber = NULL; if ( refer_cnt < 0 ) { return( -1 ); /* fatal error */ } @@ -416,7 +411,8 @@ Debug( LDAP_DEBUG_TRACE, simple_request = ( hadref ? 0 : 1 ); } else { /* request with referrals or child request */ - ber_clear( ber, 1 ); /* gack! */ + ber_free( ber, 1 ); + ber = NULL; } while ( lr->lr_parent != NULL ) { @@ -438,10 +434,10 @@ Debug( LDAP_DEBUG_TRACE, lr->lr_res_errno, lr->lr_res_error ? lr->lr_res_error : "", lr->lr_res_matched ? lr->lr_res_matched : "" ); if ( !simple_request ) { - ber_clear( ber, 1 ); /* gack! */ - if ( build_result_ber( ld, ber, lr ) + ber_free( ber, 1 ); + ber = NULL; + if ( build_result_ber( ld, &ber, lr ) == LBER_ERROR ) { - ld->ld_errno = LDAP_NO_MEMORY; rc = -1; /* fatal error */ } } @@ -455,21 +451,19 @@ lr->lr_res_matched ? lr->lr_res_matched : "" ); } } - if ( ber->ber_buf == NULL ) { + if ( ber == NULL ) { return( rc ); } -#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */ /* make a new ldap message */ - if ( (new = (LDAPMessage *) calloc( 1, sizeof(LDAPMessage) )) + if ( (new = (LDAPMessage *) LDAP_CALLOC( 1, sizeof(LDAPMessage) )) == NULL ) { ld->ld_errno = LDAP_NO_MEMORY; return( -1 ); } new->lm_msgid = (int)id; new->lm_msgtype = tag; - new->lm_ber = ber_dup( ber ); - ber_clear( ber, 0 ); /* don't kill buffer */ + new->lm_ber = ber; #ifndef LDAP_NOCACHE if ( ld->ld_cache != NULL ) { @@ -496,15 +490,15 @@ lr->lr_res_matched ? lr->lr_res_matched : "" ); * search response. */ - prev = NULLMSG; - for ( l = ld->ld_responses; l != NULLMSG; l = l->lm_next ) { + prev = NULL; + for ( l = ld->ld_responses; l != NULL; l = l->lm_next ) { if ( l->lm_msgid == new->lm_msgid ) break; prev = l; } /* not part of an existing search response */ - if ( l == NULLMSG ) { + if ( l == NULL ) { if ( foundit ) { *result = new; ld->ld_errno = LDAP_SUCCESS; @@ -520,7 +514,7 @@ lr->lr_res_matched ? lr->lr_res_matched : "" ); new->lm_msgid, new->lm_msgtype, 0 ); /* part of a search response - add to end of list of entries */ - for ( tmp = l; tmp->lm_chain != NULLMSG && + for ( tmp = l; tmp->lm_chain != NULL && tmp->lm_chain->lm_msgtype == LDAP_RES_SEARCH_ENTRY; tmp = tmp->lm_chain ) ; /* NULL */ @@ -528,7 +522,7 @@ lr->lr_res_matched ? lr->lr_res_matched : "" ); /* return the whole chain if that's what we were looking for */ if ( foundit ) { - if ( prev == NULLMSG ) + if ( prev == NULL ) ld->ld_responses = l->lm_next; else prev->lm_next = l->lm_next; @@ -552,32 +546,56 @@ lr->lr_res_matched ? lr->lr_res_matched : "" ); } -#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS -static unsigned long -build_result_ber( LDAP *ld, BerElement *ber, LDAPRequest *lr ) +static ber_tag_t +build_result_ber( LDAP *ld, BerElement **bp, LDAPRequest *lr ) { - unsigned long len; - long along; + ber_len_t len; + ber_int_t tag; + ber_int_t along; + BerElement *ber; + + *bp = NULL; + ber = ldap_alloc_ber_with_options( ld ); + + if( ber == NULL ) { + ld->ld_errno = LDAP_NO_MEMORY; + return LBER_ERROR; + } - ber_init_w_nullc( ber, 0 ); - ldap_set_ber_options( ld, ber ); if ( ber_printf( ber, "{it{ess}}", lr->lr_msgid, - (unsigned long) lr->lr_res_msgtype, lr->lr_res_errno, + 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 ); } ber_reset( ber, 1 ); + if ( ber_skip_tag( ber, &len ) == LBER_ERROR ) { + ld->ld_errno = LDAP_DECODING_ERROR; + ber_free(ber, 1); return( LBER_ERROR ); } if ( ber_get_int( ber, &along ) == LBER_ERROR ) { + ld->ld_errno = LDAP_DECODING_ERROR; + ber_free(ber, 1); + return( LBER_ERROR ); + } + + tag = ber_peek_tag( ber, &len ); + + if ( tag == LBER_ERROR ) { + ld->ld_errno = LDAP_DECODING_ERROR; + ber_free(ber, 1); return( LBER_ERROR ); } - return( ber_peek_tag( ber, &len )); + *bp = ber; + return tag; } @@ -597,13 +615,13 @@ merge_error_info( LDAP *ld, LDAPRequest *parentr, LDAPRequest *lr ) parentr->lr_res_errno == LDAP_SUCCESS ) { parentr->lr_res_errno = lr->lr_res_errno; if ( parentr->lr_res_error != NULL ) { - free( parentr->lr_res_error ); + 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 ( parentr->lr_res_matched != NULL ) { - free( parentr->lr_res_matched ); + LDAP_FREE( parentr->lr_res_matched ); } parentr->lr_res_matched = lr->lr_res_matched; lr->lr_res_matched = NULL; @@ -617,44 +635,9 @@ merge_error_info( LDAP *ld, LDAPRequest *parentr, LDAPRequest *lr ) parentr->lr_res_error : "", parentr->lr_res_matched ? parentr->lr_res_matched : "" ); } -#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */ -#if defined( LDAP_CONNECTIONLESS ) || !defined( LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS ) - -static int -ldap_select1( LDAP *ld, struct timeval *timeout ) -{ - fd_set readfds; - static int tblsize; - - assert( ld != NULL ); - - if ( tblsize == 0 ) { -#ifdef HAVE_SYSCONF - tblsize = sysconf( _SC_OPEN_MAX ); -#elif HAVE_GETDTABLESIZE - tblsize = getdtablesize(); -#else - tblsize = FD_SETSIZE; -#endif -#ifdef FD_SETSIZE - if ( tblsize > FD_SETSIZE ) { - tblsize = FD_SETSIZE; - } -#endif /* FD_SETSIZE */ - } - - FD_ZERO( &readfds ); - FD_SET( ber_pvt_sb_get_desc(&ld->ld_sb), &readfds ); - - return( select( tblsize, &readfds, 0, 0, timeout ) ); -} - -#endif /* !LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */ - - int ldap_msgtype( LDAPMessage *lm ) { @@ -682,11 +665,11 @@ ldap_msgfree( LDAPMessage *lm ) Debug( LDAP_DEBUG_TRACE, "ldap_msgfree\n", 0, 0, 0 ); - for ( ; lm != NULLMSG; lm = next ) { + for ( ; lm != NULL; lm = next ) { next = lm->lm_chain; type = lm->lm_msgtype; ber_free( lm->lm_ber, 1 ); - free( (char *) lm ); + LDAP_FREE( (char *) lm ); } return( type ); @@ -706,17 +689,17 @@ ldap_msgdelete( LDAP *ld, int msgid ) Debug( LDAP_DEBUG_TRACE, "ldap_msgdelete\n", 0, 0, 0 ); - prev = NULLMSG; - for ( lm = ld->ld_responses; lm != NULLMSG; lm = lm->lm_next ) { + prev = NULL; + for ( lm = ld->ld_responses; lm != NULL; lm = lm->lm_next ) { if ( lm->lm_msgid == msgid ) break; prev = lm; } - if ( lm == NULLMSG ) + if ( lm == NULL ) return( -1 ); - if ( prev == NULLMSG ) + if ( prev == NULL ) ld->ld_responses = lm->lm_next; else prev->lm_next = lm->lm_next; @@ -732,7 +715,7 @@ ldap_msgdelete( LDAP *ld, int msgid ) * return 1 if message msgid is waiting to be abandoned, 0 otherwise */ static int -ldap_abandoned( LDAP *ld, int msgid ) +ldap_abandoned( LDAP *ld, ber_int_t msgid ) { int i; @@ -748,7 +731,7 @@ ldap_abandoned( LDAP *ld, int msgid ) static int -ldap_mark_abandoned( LDAP *ld, int msgid ) +ldap_mark_abandoned( LDAP *ld, ber_int_t msgid ) { int i; @@ -774,8 +757,9 @@ ldap_mark_abandoned( LDAP *ld, int msgid ) int cldap_getmsg( LDAP *ld, struct timeval *timeout, BerElement *ber ) { - int rc; - unsigned long tag, len; + int rc; + ber_tag_t tag; + ber_len_t len; if ( ! ber_pvt_sb_data_ready(&ld->ld_sb) ) { rc = ldap_select1( ld, timeout ); @@ -794,6 +778,6 @@ cldap_getmsg( LDAP *ld, struct timeval *timeout, BerElement *ber ) return( -1 ); } - return( tag ); + return( 0 ); } #endif /* LDAP_CONNECTIONLESS */