Missed a test in AttributeDescription commit

[openldap] / servers / slapd / search.c

diff --git a/servers/slapd/search.c b/servers/slapd/search.c
index 3959645337627db74e5e443b1d6bf212e6379bbc..63379e60b6a5d1c97ecc97773712fc02c779960f 100644 (file)
--- a/servers/slapd/search.c
+++ b/servers/slapd/search.c
@@ -27,7 +27,7 @@
 
 int
 do_search(
-    Connection *conn,  /* where to send results                       */
+    Connection *conn,  /* where to send results */
     Operation  *op     /* info about the op to which we're responding */
 ) {
        int             i;
@@ -39,8 +39,14 @@ do_search(
        Backend         *be;
        int                     rc;
        const char              *text;
+       int                     manageDSAit;
 
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
+                  "do_search: conn %d\n", conn->c_connid ));
+#else
        Debug( LDAP_DEBUG_TRACE, "do_search\n", 0, 0, 0 );
+#endif
 
        /*
         * Parse the search request.  It looks like this:
@@ -107,9 +113,15 @@ do_search(
                goto return_results;
        }
 
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
+                  "do_search \"%s\" %d %d %d %d %d\n", base, scope,
+                  deref, sizelimit, timelimit, attrsonly ));
+#else
        Debug( LDAP_DEBUG_ARGS, "SRCH \"%s\" %d %d", base, scope, deref );
        Debug( LDAP_DEBUG_ARGS, "    %d %d %d\n", sizelimit, timelimit,
            attrsonly);
+#endif
 
        /* filter - returns a "normalized" version */
        rc = get_filter( conn, op->o_ber, &filter, &fstr, &text );
@@ -124,7 +136,13 @@ do_search(
                goto return_results;
        }
 
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
+                  "do_search: conn %d  filter: %s\n", conn->c_connid, fstr ));
+#else
        Debug( LDAP_DEBUG_ARGS, "    filter: %s\n", fstr, 0, 0 );
+#endif
+
 
        /* attributes */
        if ( ber_scanf( op->o_ber, /*{*/ "{v}}", &attrs ) == LBER_ERROR ) {
@@ -135,48 +153,83 @@ do_search(
        }
 
        if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+                          "do_search: conn %d  get_ctrls failed (%d)\n",
+                          conn->c_connid, rc ));
+#else
                Debug( LDAP_DEBUG_ANY, "do_search: get_ctrls failed\n", 0, 0, 0 );
+#endif
+
                goto return_results;
        } 
 
-       rc = 0;
+       rc = LDAP_SUCCESS;
 
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
+                  "do_search: conn %d  attrs:", conn->c_connid ));
+#else
        Debug( LDAP_DEBUG_ARGS, "    attrs:", 0, 0, 0 );
+#endif
+
 
        if ( attrs != NULL ) {
                for ( i = 0; attrs[i] != NULL; i++ ) {
+#ifdef NEW_LOGGING
+                       LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
+                                  "do_search:     %s", attrs[i] ));
+#else
                        Debug( LDAP_DEBUG_ARGS, " %s", attrs[i], 0, 0 );
+#endif
+
                }
        }
 
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "operation", LDAP_LEVEL_ARGS, "\n" ));
+#else
        Debug( LDAP_DEBUG_ARGS, "\n", 0, 0, 0 );
+#endif
 
        Statslog( LDAP_DEBUG_STATS,
            "conn=%ld op=%d SRCH base=\"%s\" scope=%d filter=\"%s\"\n",
            op->o_connid, op->o_opid, base, scope, fstr );
 
+       manageDSAit = get_manageDSAit( op );
+
        if ( scope == LDAP_SCOPE_BASE ) {
                Entry *entry = NULL;
 
                if ( strcasecmp( nbase, LDAP_ROOT_DSE ) == 0 ) {
-                       rc = root_dse_info( &entry, &text );
-               }
-
-#if defined( SLAPD_MONITOR_DN )
-               else if ( strcasecmp( nbase, SLAPD_MONITOR_DN ) == 0 ) {
-                       rc = monitor_info( &entry, &text );
-               }
+#ifdef LDAP_CONNECTIONLESS
+                       /* Ignore LDAPv2 CLDAP DSE queries */
+                       if (op->o_protocol==LDAP_VERSION2 && conn->c_is_udp) {
+                               goto return_results;
+                       }
 #endif
+                       /* check restrictions */
+                       rc = backend_check_restrictions( NULL, conn, op, NULL, &text ) ;
+                       if( rc != LDAP_SUCCESS ) {
+                               send_ldap_result( conn, op, rc,
+                                       NULL, text, NULL, NULL );
+                               goto return_results;
+                       }
 
-#if defined( SLAPD_CONFIG_DN )
-               else if ( strcasecmp( nbase, SLAPD_CONFIG_DN ) == 0 ) {
-                       rc = config_info( &entry, &text );
+                       rc = root_dse_info( conn, &entry, &text );
                }
-#endif
 
 #if defined( SLAPD_SCHEMA_DN )
                else if ( strcasecmp( nbase, SLAPD_SCHEMA_DN ) == 0 ) {
-                       rc= schema_info( &entry, &text );
+                       /* check restrictions */
+                       rc = backend_check_restrictions( NULL, conn, op, NULL, &text ) ;
+                       if( rc != LDAP_SUCCESS ) {
+                               send_ldap_result( conn, op, rc,
+                                       NULL, text, NULL, NULL );
+                               goto return_results;
+                       }
+
+                       rc = schema_info( &entry, &text );
                }
 #endif
 
@@ -202,20 +255,27 @@ do_search(
                }
        }
 
+       if( nbase[0] == '\0' && default_search_nbase != NULL ) {
+               ch_free( base );
+               ch_free( nbase );
+               base = ch_strdup( default_search_base );
+               nbase = ch_strdup( default_search_nbase );
+       }
+
        /*
         * We could be serving multiple database backends.  Select the
         * appropriate one, or send a referral to our "referral server"
         * if we don't hold it.
         */
-       if ( (be = select_backend( nbase )) == NULL ) {
+       if ( (be = select_backend( nbase, manageDSAit )) == NULL ) {
                send_ldap_result( conn, op, rc = LDAP_REFERRAL,
                        NULL, NULL, default_referral, NULL );
 
                goto return_results;
        }
 
-       /* make sure this backend recongizes critical controls */
-       rc = backend_check_controls( be, conn, op, &text ) ;
+       /* check restrictions */
+       rc = backend_check_restrictions( be, conn, op, NULL, &text ) ;
        if( rc != LDAP_SUCCESS ) {
                send_ldap_result( conn, op, rc,
                        NULL, text, NULL, NULL );