cleanup old TOOLID macro

diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index a8125db10c2b955c03ab1e535122e4d3d9b4cbcd..006167632a5926609ff93820a914d843044cc700 100644 (file)
--- a/servers/slapd/init.c
+++ b/servers/slapd/init.c
@@ -89,8 +89,9 @@ slap_init( int mode, char *name )
                case SLAP_SERVER_MODE:
                case SLAP_TOOL_MODE:
                        Debug( LDAP_DEBUG_TRACE,
-                               "%s init: initiated %s.\n",
-                               name, ( mode & SLAP_TOOL_MODE ) ? "tool" : "server", 0 );
+                               "%s init: initiated %s.\n",     name,
+                               (mode & SLAP_MODE) == SLAPD_TOOL_MODE ? "tool" : "server",
+                               0 );
 
                        slap_name = name;
        

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index a9d860d8837255b593482a0f966a5af10dc82c48..962d7f4a0952d4da5a3e6c4dc0106a9248fbf5fb 100644 (file)
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -99,6 +99,7 @@ root_dse_info( Connection *conn, Operation *op, char **attrs, int attrsonly )
 
        send_search_entry( &backends[0], conn, op,
                e, attrs, attrsonly, NULL );
+
        send_search_result( conn, op, LDAP_SUCCESS,
                NULL, NULL, NULL, NULL, 1 );
 

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 391c9e9745562ea2f65324eb93f04c0da07b2922..76222e9233f01468f4f867130f9e7c319a18de05 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -689,7 +689,6 @@ LIBSLAPD_F (int) slapMode;
 #ifdef SLAPD_BDB2
 #define SLAP_TIMED_MODE                0x1000
 #endif
-#define SLAP_TOOLID_MODE    4
 
 /* temporary aliases */
 typedef BackendDB Backend;