Add a default case with assert() just in case.

[openldap] / servers / slapd / search.c

diff --git a/servers/slapd/search.c b/servers/slapd/search.c
index 52e22285c5033503163eb7536967a4d7615a33bf..c3a6acc34d127809fe07deaf85632e8eca55f4d2 100644 (file)
--- a/servers/slapd/search.c
+++ b/servers/slapd/search.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /* Portions
@@ -38,10 +38,9 @@ do_search(
        struct berval   fstr = { 0, NULL };
        Filter          *filter = NULL;
        AttributeName   *an;
-       ber_len_t       siz, off;
+       ber_len_t       siz, off, i;
        Backend         *be;
        int                     rc;
-       int                     i;
        const char      *text;
        int                     manageDSAit;
 
@@ -77,7 +76,7 @@ do_search(
         */
 
        /* baseObject, scope, derefAliases, sizelimit, timelimit, attrsOnly */
-       if ( ber_scanf( op->o_ber, "{oiiiib" /*}*/,
+       if ( ber_scanf( op->o_ber, "{miiiib" /*}*/,
                &base, &scope, &deref, &sizelimit,
            &timelimit, &attrsonly ) == LBER_ERROR )
        {
@@ -156,11 +155,10 @@ do_search(
        Debug( LDAP_DEBUG_ARGS, "    filter: %s\n", fstr.bv_val, 0, 0 );
 #endif
 
-
        /* attributes */
        siz = sizeof(AttributeName);
        off = 0;
-       if ( ber_scanf( op->o_ber, "{w}}", &an, &siz, off ) == LBER_ERROR ) {
+       if ( ber_scanf( op->o_ber, "{M}}", &an, &siz, off ) == LBER_ERROR ) {
                send_ldap_disconnect( conn, op,
                        LDAP_PROTOCOL_ERROR, "decoding attrs error" );
                rc = SLAPD_DISCONNECT;
@@ -168,6 +166,7 @@ do_search(
        }
        for ( i=0; i<siz; i++ ) {
                an[i].an_desc = NULL;
+               an[i].an_oc = NULL;
                slap_bv2ad(&an[i].an_name, &an[i].an_desc, &text);
        }
 
@@ -181,9 +180,7 @@ do_search(
 #endif
 
                goto return_results;
-       } 
-
-       rc = LDAP_SUCCESS;
+       }
 
 #ifdef NEW_LOGGING
        LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
@@ -192,7 +189,6 @@ do_search(
        Debug( LDAP_DEBUG_ARGS, "    attrs:", 0, 0, 0 );
 #endif
 
-
        if ( siz != 0 ) {
                for ( i = 0; i<siz; i++ ) {
 #ifdef NEW_LOGGING
@@ -201,7 +197,6 @@ do_search(
 #else
                        Debug( LDAP_DEBUG_ARGS, " %s", an[i].an_name.bv_val, 0, 0 );
 #endif
-
                }
        }
 
@@ -220,9 +215,9 @@ do_search(
        if ( scope == LDAP_SCOPE_BASE ) {
                Entry *entry = NULL;
 
-               if ( strcasecmp( nbase.bv_val, LDAP_ROOT_DSE ) == 0 ) {
+               if ( nbase.bv_len == 0 ) {
 #ifdef LDAP_CONNECTIONLESS
-                       /* Ignore LDAPv2 CLDAP DSE queries */
+                       /* Ignore LDAPv2 CLDAP Root DSE queries */
                        if (op->o_protocol==LDAP_VERSION2 && conn->c_is_udp) {
                                goto return_results;
                        }
@@ -288,13 +283,13 @@ do_search(
         * if we don't hold it.
         */
        if ( (be = select_backend( &nbase, manageDSAit, 1 )) == NULL ) {
-               BVarray ref = referral_rewrite( default_referral,
+               BerVarray ref = referral_rewrite( default_referral,
                        NULL, &pbase, scope );
 
                send_ldap_result( conn, op, rc = LDAP_REFERRAL,
                        NULL, NULL, ref ? ref : default_referral, NULL );
 
-               bvarray_free( ref );
+               ber_bvarray_free( ref );
                goto return_results;
        }
 
@@ -322,19 +317,16 @@ do_search(
                    timelimit, filter, &fstr, an, attrsonly );
        } else {
                send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
-                       NULL, "operation not supported within namingContext", NULL, NULL );
+                       NULL, "operation not supported within namingContext",
+                       NULL, NULL );
        }
 
 return_results:;
-       free( base.bv_val );
        if( pbase.bv_val != NULL) free( pbase.bv_val );
        if( nbase.bv_val != NULL) free( nbase.bv_val );
 
        if( fstr.bv_val != NULL) free( fstr.bv_val );
        if( filter != NULL) filter_free( filter );
-       for (i = 0; i<siz; i++ ) {
-               free(an[i].an_name.bv_val);
-       }
        free(an);
 
        return rc;