X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fsearch.c;h=cb31e0f1bd5065e10c18050b5770d088e69b3626;hb=bcf8f7eeb788faa25efe0ea78e66e83e9d9b4d73;hp=56b07a7df273a2c87581a42c4ad90d4a9d47b0fe;hpb=635a666359d232305b1e264cb1e635e64212c615;p=openldap diff --git a/libraries/libldap/search.c b/libraries/libldap/search.c index 56b07a7df2..cb31e0f1bd 100644 --- a/libraries/libldap/search.c +++ b/libraries/libldap/search.c @@ -1,5 +1,6 @@ +/* $OpenLDAP$ */ /* - * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ /* Portions @@ -31,15 +32,9 @@ static int ldap_is_attr_desc LDAP_P(( static int hex2value LDAP_P(( int c )); -static ber_slen_t filter_value_unescape LDAP_P(( - char *filter )); - static char *find_right_paren LDAP_P(( char *s )); -static char *find_wildcard LDAP_P(( - char *s )); - static char *put_complex_filter LDAP_P(( BerElement *ber, char *str, @@ -103,12 +98,21 @@ ldap_search_ext( Debug( LDAP_DEBUG_TRACE, "ldap_search_ext\n", 0, 0, 0 ); /* - * if timeout is provided, use only tv_sec as timelimit. - * otherwise, use default. + * if timeout is provided, both tv_sec and tv_usec must + * be non-zero */ - timelimit = (timeout != NULL) - ? timeout->tv_sec - : -1; + if( timeout != NULL ) { + if( timeout->tv_sec == 0 && timeout->tv_usec == 0 ) { + return LDAP_PARAM_ERROR; + } + + /* timelimit must be non-zero if timeout is provided */ + timelimit = timeout->tv_sec != 0 ? timeout->tv_sec : 1; + + } else { + /* no timeout, no timelimit */ + timelimit = -1; + } ber = ldap_build_search_req( ld, base, scope, filter, attrs, attrsonly, sctrls, cctrls, timelimit, sizelimit ); @@ -162,8 +166,12 @@ ldap_search_ext_s( return( rc ); } - if ( ldap_result( ld, msgid, 1, timeout, res ) == -1 ) + rc = ldap_result( ld, msgid, 1, timeout, res ); + + if( rc <= 0 ) { + /* error(-1) or timeout(0) */ return( ld->ld_errno ); + } return( ldap_result2error( ld, *res, 0 ) ); } @@ -222,7 +230,7 @@ ldap_search( BerElement * ldap_build_search_req( LDAP *ld, - LDAP_CONST char *base_in, + LDAP_CONST char *base, ber_int_t scope, LDAP_CONST char *filter_in, char **attrs, @@ -234,7 +242,6 @@ ldap_build_search_req( { BerElement *ber; int err; - char *base; char *filter; /* @@ -266,16 +273,14 @@ ldap_build_search_req( return( NULL ); } - if ( base_in == NULL ) { + if ( base == NULL ) { /* no base provided, use session default base */ base = ld->ld_options.ldo_defbase; - } else { - base = (char *) base_in; - } - if ( base == NULL ) { - /* no session default base, use top */ - base = ""; + if ( base == NULL ) { + /* no session default base, use top */ + base = ""; + } } #ifdef LDAP_CONNECTIONLESS @@ -302,7 +307,11 @@ ldap_build_search_req( return( NULL ); } - filter = LDAP_STRDUP( filter_in ); + if( filter_in != NULL ) { + filter = LDAP_STRDUP( filter_in ); + } else { + filter = LDAP_STRDUP( "(objectclass=*)" ); + } err = put_filter( ber, filter ); LDAP_FREE( filter ); @@ -337,7 +346,7 @@ static int ldap_is_attr_oid ( const char *attr ) { int i, c, digit=0; - for( i=0 ; c = attr[i] ; i++ ) { + for( i = 0; (c = attr[i]) != 0; i++ ) { if( c >= '0' && c <= '9' ) { digit=1; @@ -356,7 +365,6 @@ static int ldap_is_attr_oid ( const char *attr ) } return digit; - } static int ldap_is_attr_desc ( const char *attr ) @@ -364,7 +372,7 @@ static int ldap_is_attr_desc ( const char *attr ) /* cheap attribute description check */ int i, c; - for( i=0; c = attr[i]; i++ ) { + for( i = 0; (c = attr[i]) != 0; i++ ) { if (( c >= '0' && c <= '9' ) || ( c >= 'A' && c <= 'Z' ) || ( c >= 'a' && c <= 'z' ) @@ -419,20 +427,18 @@ static int hex2value( int c ) return -1; } -static char * -find_wildcard( char *s ) +char * +ldap_pvt_find_wildcard( const char *s ) { for( ; *s != '\0' ; s++ ) { switch( *s ) { case '*': /* found wildcard */ - return s; + return (char *) s; case '\\': s++; /* skip over escape */ - if( hex2value( s[0] ) >= 0 && hex2value( s[1] ) >= 0 ) { - /* skip over lead digit of two hex digit code */ - s++; - } + if ( *s == '\0' ) + return NULL; /* escape at end of string */ } } @@ -442,8 +448,8 @@ find_wildcard( char *s ) /* unescape filter value */ /* support both LDAP v2 and v3 escapes */ /* output can include nul characters */ -static ber_slen_t -filter_value_unescape( char *fval ) +ber_slen_t +ldap_pvt_filter_value_unescape( char *fval ) { ber_slen_t r, v; int v1, v2; @@ -566,6 +572,10 @@ put_filter( BerElement *ber, char *str ) case '(': str++; parens++; + + /* skip spaces */ + while( isspace( *str ) ) str++; + switch ( *str ) { case '&': Debug( LDAP_DEBUG_TRACE, "put_filter: AND\n", @@ -806,7 +816,7 @@ put_simple_filter( } if( rc != -1 ) { - ber_slen_t len = filter_value_unescape( value ); + ber_slen_t len = ldap_pvt_filter_value_unescape( value ); if( len >= 0 ) { rc = ber_printf( ber, "totb}", @@ -820,7 +830,7 @@ put_simple_filter( break; default: - if ( find_wildcard( value ) == NULL ) { + if ( ldap_pvt_find_wildcard( value ) == NULL ) { ftype = LDAP_FILTER_EQUALITY; } else if ( strcmp( value, "*" ) == 0 ) { ftype = LDAP_FILTER_PRESENT; @@ -835,7 +845,7 @@ put_simple_filter( rc = ber_printf( ber, "ts", ftype, str ); } else { - ber_slen_t len = filter_value_unescape( value ); + ber_slen_t len = ldap_pvt_filter_value_unescape( value ); if( len >= 0 ) { rc = ber_printf( ber, "t{so}", @@ -863,7 +873,7 @@ put_substring_filter( BerElement *ber, char *type, char *val ) return( -1 ); for( ; val != NULL; val=nextstar ) { - if ( (nextstar = find_wildcard( val )) != NULL ) + if ( (nextstar = ldap_pvt_find_wildcard( val )) != NULL ) *nextstar++ = '\0'; if ( gotstar == 0 ) { @@ -875,7 +885,7 @@ put_substring_filter( BerElement *ber, char *type, char *val ) } if ( *val != '\0' ) { - ber_slen_t len = filter_value_unescape( val ); + ber_slen_t len = ldap_pvt_filter_value_unescape( val ); if ( len < 0 ) { return -1;