Remove dead code

[openldap] / libraries / libldap / search.c

diff --git a/libraries/libldap/search.c b/libraries/libldap/search.c
index 84a58f3b026fdc157cd3beabe85f7880fe7d750f..5adb5b8ed2d7aa976264eb91664b6c5df1d1f745 100644 (file)
--- a/libraries/libldap/search.c
+++ b/libraries/libldap/search.c
@@ -1,6 +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
@@ -16,7 +16,6 @@
 
 #include <ac/stdlib.h>
 
-#include <ac/ctype.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>
@@ -92,11 +91,19 @@ ldap_search_ext(
        int sizelimit,
        int *msgidp )
 {
+       int rc;
        BerElement      *ber;
        int timelimit;
 
        Debug( LDAP_DEBUG_TRACE, "ldap_search_ext\n", 0, 0, 0 );
 
+       assert( ld != NULL );
+       assert( LDAP_VALID( ld ) );
+
+       /* check client controls */
+       rc = ldap_int_client_controls( ld, cctrls );
+       if( rc != LDAP_SUCCESS ) return rc;
+
        /*
         * if timeout is provided, both tv_sec and tv_usec must
         * be non-zero
@@ -173,6 +180,10 @@ ldap_search_ext_s(
                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 ) );
 }
 
@@ -204,6 +215,9 @@ ldap_search(
 
        Debug( LDAP_DEBUG_TRACE, "ldap_search\n", 0, 0, 0 );
 
+       assert( ld != NULL );
+       assert( LDAP_VALID( ld ) );
+
        ber = ldap_build_search_req( ld, base, scope, filter, attrs,
            attrsonly, NULL, NULL, -1, -1 ); 
 
@@ -283,23 +297,11 @@ ldap_build_search_req(
                }
        }
 
-#ifdef LDAP_CONNECTIONLESS
-       if ( ld->ld_cldapnaddr > 0 ) {
-           err = ber_printf( ber, "{ist{seeiib", ++ld->ld_msgid,
-                       ld->ld_cldapdn, LDAP_REQ_SEARCH, base, scope, ld->ld_deref,
-                       (sizelimit < 0) ? ld->ld_sizelimit : sizelimit,
-                       (timelimit < 0) ? ld->ld_timelimit : timelimit,
-                       attrsonly );
-       } else {
-#endif /* LDAP_CONNECTIONLESS */
-               err = ber_printf( ber, "{it{seeiib", ++ld->ld_msgid,
-                   LDAP_REQ_SEARCH, base, (ber_int_t) scope, ld->ld_deref,
-                       (sizelimit < 0) ? ld->ld_sizelimit : sizelimit,
-                       (timelimit < 0) ? ld->ld_timelimit : timelimit,
-                   attrsonly );
-#ifdef LDAP_CONNECTIONLESS
-       }
-#endif /* LDAP_CONNECTIONLESS */
+       err = ber_printf( ber, "{it{seeiib", ++ld->ld_msgid,
+               LDAP_REQ_SEARCH, base, (ber_int_t) scope, ld->ld_deref,
+               (sizelimit < 0) ? ld->ld_sizelimit : sizelimit,
+               (timelimit < 0) ? ld->ld_timelimit : timelimit,
+               attrsonly );
 
        if ( err == -1 ) {
                ld->ld_errno = LDAP_ENCODING_ERROR;
@@ -307,7 +309,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 );
 
@@ -317,7 +323,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 );
@@ -329,7 +335,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 );
@@ -424,12 +430,12 @@ static int hex2value( int c )
 }
 
 char *
-ldap_pvt_find_wildcard( char *s )
+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 */
@@ -515,7 +521,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 );
@@ -568,6 +574,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",
@@ -678,7 +688,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;
@@ -754,38 +764,39 @@ put_simple_filter(
 
                        if( dn == NULL ) {
                                if(! ldap_is_attr_desc( str ) ) goto done;
-                               break;
-                       }
+                       } else {
 
-                       *dn++ = '\0';
-                       rule = strchr( dn, ':' );
+                               *dn++ = '\0';
+                               rule = strchr( dn, ':' );
 
-                       if( rule == NULL ) {
-                               /* one colon */
-                               if ( strcmp(dn, "dn") == 0 ) {
-                                       /* must have attribute */
-                                       if( !ldap_is_attr_desc( str ) ) {
-                                               goto done;
-                                       }
+                               if( rule == NULL ) {
+                                       /* one colon */
+                                       if ( strcmp(dn, "dn") == 0 ) {
+                                               /* must have attribute */
+                                               if( !ldap_is_attr_desc( str ) ) {
+                                                       goto done;
+                                               }
 
-                                       rule = "";
+                                               rule = "";
 
-                               } else {
-                                       rule = dn;
-                                       dn = NULL;
-                               }
+                                       } else {
+                                         rule = dn;
+                                         dn = NULL;
+                                       }
                                
-                       } else {
-                               /* two colons */
-                               *rule++ = '\0';
+                               } else {
+                                       /* two colons */
+                                       *rule++ = '\0';
 
-                               if ( strcmp(dn, "dn") != 0 ) {
-                                       /* must have "dn" */
-                                       goto done;
+                                       if ( strcmp(dn, "dn") != 0 ) {
+                                               /* must have "dn" */
+                                               goto done;
+                                       }
                                }
+
                        }
 
-                       if ( *str == '\0' && *rule == '\0' ) {
+                       if ( *str == '\0' && ( !rule || *rule == '\0' ) ) {
                                /* must have either type or rule */
                                goto done;
                        }
@@ -794,13 +805,13 @@ put_simple_filter(
                                goto done;
                        }
 
-                       if ( *rule != '\0' && !ldap_is_attr_oid( rule ) ) {
+                       if ( rule && *rule != '\0' && !ldap_is_attr_oid( rule ) ) {
                                goto done;
                        }
 
                        rc = ber_printf( ber, "t{" /*}*/, ftype );
 
-                       if( rc != -1 && *rule != '\0' ) {
+                       if( rc != -1 && rule && *rule != '\0' ) {
                                rc = ber_printf( ber, "ts", LDAP_FILTER_EXT_OID, rule );
                        }
                        if( rc != -1 && *str != '\0' ) {
@@ -811,7 +822,7 @@ put_simple_filter(
                                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 +830,7 @@ put_simple_filter(
                                }
                        }
                }
-               break;
+               goto done;
 
        default:
                if ( ldap_pvt_find_wildcard( value ) == NULL ) {
@@ -840,7 +851,7 @@ put_simple_filter(
                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 );
                }
        }
@@ -891,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 );