Add char* ldap_pvt_get_fqdn(char*) which returns the FQDN of the

[openldap] / libraries / libldap / search.c

diff --git a/libraries/libldap/search.c b/libraries/libldap/search.c
index bb9f1c28f86ad0d45294e377392459fa7d682a6b..9587adc4a8ff0d56d40a8804f8b7a16e574de8ae 100644 (file)
--- 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
@@ -15,7 +16,6 @@
 
 #include <ac/stdlib.h>
 
-#include <ac/ctype.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>
@@ -31,15 +31,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 +97,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 +165,16 @@ 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 );
+       }
+
+       if( rc == LDAP_RES_SEARCH_REFERENCE || rc == LDAP_RES_EXTENDED_PARTIAL ) {
+               return( ld->ld_errno );
+       }
 
        return( ldap_result2error( ld, *res, 0 ) );
 }
@@ -299,7 +310,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 );
 
@@ -309,7 +324,7 @@ ldap_build_search_req(
                return( NULL );
        }
 
-       if ( ber_printf( ber, /*{*/ "{v}}", attrs ) == -1 ) {
+       if ( ber_printf( ber, /*{*/ "{v}N}", attrs ) == -1 ) {
                ld->ld_errno = LDAP_ENCODING_ERROR;
                ber_free( ber, 1 );
                return( NULL );
@@ -321,7 +336,7 @@ ldap_build_search_req(
                return( NULL );
        }
 
-       if ( ber_printf( ber, /*{*/ "}", attrs ) == -1 ) {
+       if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) {
                ld->ld_errno = LDAP_ENCODING_ERROR;
                ber_free( ber, 1 );
                return( NULL );
@@ -334,7 +349,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;
 
@@ -353,7 +368,6 @@ static int ldap_is_attr_oid ( const char *attr )
        }
 
        return digit;
-
 }
 
 static int ldap_is_attr_desc ( const char *attr )
@@ -361,7 +375,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' )
@@ -416,22 +430,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 ( *s == '\0' )
                                return NULL;    /* escape at end of string */
-                       if( hex2value( s[0] ) >= 0 && hex2value( s[1] ) >= 0 ) {
-                               /* skip over lead digit of two hex digit code */
-                               s++;
-                       }
                }
        }
 
@@ -441,8 +451,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;
@@ -512,7 +522,7 @@ put_complex_filter( BerElement *ber, char *str, ber_tag_t tag, int not )
        *next++ = ')';
 
        /* flush explicit tagged thang */
-       if ( ber_printf( ber, /*{*/ "}" ) == -1 )
+       if ( ber_printf( ber, /*{*/ "N}" ) == -1 )
                return( NULL );
 
        return( next );
@@ -565,6 +575,10 @@ put_filter( BerElement *ber, char *str )
                case '(':
                        str++;
                        parens++;
+
+                       /* skip spaces */
+                       while( LDAP_SPACE( *str ) ) str++;
+
                        switch ( *str ) {
                        case '&':
                                Debug( LDAP_DEBUG_TRACE, "put_filter: AND\n",
@@ -675,7 +689,7 @@ put_filter_list( BerElement *ber, char *str )
        Debug( LDAP_DEBUG_TRACE, "put_filter_list \"%s\"\n", str, 0, 0 );
 
        while ( *str ) {
-               while ( *str && isspace( (unsigned char) *str ) )
+               while ( *str && LDAP_SPACE( (unsigned char) *str ) )
                        str++;
                if ( *str == '\0' )
                        break;
@@ -805,10 +819,10 @@ 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}",
+                                       rc = ber_printf( ber, "totbN}",
                                                LDAP_FILTER_EXT_VALUE, value, len,
                                                LDAP_FILTER_EXT_DNATTRS, dn != NULL);
                                } else {
@@ -819,7 +833,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;
@@ -834,10 +848,10 @@ 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}",
+                       rc = ber_printf( ber, "t{soN}",
                                ftype, str, value, len );
                }
        }
@@ -862,7 +876,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 ) {
@@ -874,7 +888,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;
@@ -888,7 +902,7 @@ put_substring_filter( BerElement *ber, char *type, char *val )
                gotstar = 1;
        }
 
-       if ( ber_printf( ber, /* {{ */ "}}" ) == -1 )
+       if ( ber_printf( ber, /* {{ */ "N}N}" ) == -1 )
                return( -1 );
 
        return( 0 );