The Root DSE does not depend on SLAPD_CONFIG_DN and friends.

Added a comment for supportedSASLMechanism to root_dse.c

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index 56cc7ad593b65045ee8fa29a5165181d71363984..44b0369379a8bea4afbb3c24e9229a283a4e2984 100644 (file)
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -54,6 +54,7 @@ root_dse_info( Connection *conn, Operation *op )
        /* altServer unsupported */
        /* supportedExtension: no extensions supported */
        /* supportedControl: no controls supported */
+       /* supportedSASLMechanism: not yet */
 
        for ( i=LDAP_VERSION_MIN; i<=LDAP_VERSION_MAX; i++ ) {
                sprintf(buf,"%d",i);

diff --git a/servers/slapd/search.c b/servers/slapd/search.c
index 0b76e934dbd08ed0fa93d39b123ccbac4f7fc70b..f1dd5b7226ca417cc40c549c00006ca93ab09768 100644 (file)
--- a/servers/slapd/search.c
+++ b/servers/slapd/search.c
@@ -126,13 +126,14 @@ do_search(
                        goto return_results;
                }
 #endif
-               if ( strcmp( base, LDAP_ROOT_DSE ) == 0 ) {
-                       root_dse_info( conn, op );
-                       goto return_results;
-               }
        }
 #endif /* monitor or config or schema dn */
 
+       if ( strcmp( base, LDAP_ROOT_DSE ) == 0 && scope == LDAP_SCOPE_BASE ) {
+               root_dse_info( conn, op );
+               goto return_results;
+       }
+
        /*
         * We could be serving multiple database backends.  Select the
         * appropriate one, or send a referral to our "referral server"