ITS#1716 is_entry_subentr/ies/y/

[openldap] / servers / slapd / search.c

diff --git a/servers/slapd/search.c b/servers/slapd/search.c
index 75795eaabf8c8677e2dff0fd631c37459ba03a0c..6ba03faf3a19d9f507edf35e2271c493a0acf1c9 100644 (file)
--- a/servers/slapd/search.c
+++ b/servers/slapd/search.c
@@ -37,7 +37,7 @@ do_search(
        struct berval nbase = { 0, NULL };
        struct berval   fstr = { 0, NULL };
        Filter          *filter = NULL;
-       AttributeName   *an;
+       AttributeName   *an = NULL;
        ber_len_t       siz, off, i;
        Backend         *be;
        int                     rc;
@@ -136,7 +136,7 @@ do_search(
 #endif
 
        /* filter - returns a "normalized" version */
-       rc = get_filter( conn, op->o_ber, &filter, &fstr, &text );
+       rc = get_filter( conn, op->o_ber, &filter, &text );
        if( rc != LDAP_SUCCESS ) {
                if( rc == SLAPD_DISCONNECT ) {
                        send_ldap_disconnect( conn, op,
@@ -146,16 +146,20 @@ do_search(
                                NULL, text, NULL, NULL );
                }
                goto return_results;
+
+       } else {
+               filter2bv( filter, &fstr );
        }
 
 #ifdef NEW_LOGGING
        LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
-               "do_search: conn %d     filter: %s\n", conn->c_connid, fstr.bv_val ));
+               "do_search: conn %d     filter: %s\n", conn->c_connid,
+               fstr.bv_len ? fstr.bv_val : "empty" ));
 #else
-       Debug( LDAP_DEBUG_ARGS, "    filter: %s\n", fstr.bv_val, 0, 0 );
+       Debug( LDAP_DEBUG_ARGS, "    filter: %s\n",
+               fstr.bv_len ? fstr.bv_val : "empty", 0, 0 );
 #endif
 
-
        /* attributes */
        siz = sizeof(AttributeName);
        off = 0;
@@ -167,6 +171,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);
        }
 
@@ -180,9 +185,7 @@ do_search(
 #endif
 
                goto return_results;
-       } 
-
-       rc = LDAP_SUCCESS;
+       }
 
 #ifdef NEW_LOGGING
        LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
@@ -191,7 +194,6 @@ do_search(
        Debug( LDAP_DEBUG_ARGS, "    attrs:", 0, 0, 0 );
 #endif
 
-
        if ( siz != 0 ) {
                for ( i = 0; i<siz; i++ ) {
 #ifdef NEW_LOGGING
@@ -218,9 +220,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;
                        }
@@ -286,13 +288,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;
        }
 
@@ -320,7 +322,8 @@ 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:;
@@ -329,7 +332,7 @@ return_results:;
 
        if( fstr.bv_val != NULL) free( fstr.bv_val );
        if( filter != NULL) filter_free( filter );
-       free(an);
+       if( an != NULL ) free( an );
 
        return rc;
 }