--- servers/slapd/root_dse.c	1999/07/09 16:31:11	1.8.2.1
+++ servers/slapd/root_dse.c	1999/08/17 19:21:43	1.16
@@ -13,6 +13,8 @@
 
 #include <stdio.h>
 
+#include <ac/string.h>
+
 #include "ldap_defaults.h"
 #include "slap.h"
 
@@ -32,7 +34,8 @@ root_dse_info( Connection *conn, Operati
 
 	e->e_attrs = NULL;
 	e->e_dn = ch_strdup( LDAP_ROOT_DSE );
-	e->e_ndn = dn_normalize_case( ch_strdup( LDAP_ROOT_DSE ));
+	e->e_ndn = ch_strdup( LDAP_ROOT_DSE );
+	(void) dn_normalize_case( e->e_ndn );
 	e->e_private = NULL;
 
 	for ( i = 0; i < nbackends; i++ ) {
@@ -87,18 +90,34 @@ root_dse_info( Connection *conn, Operati
 	}
 
 	/* supportedSASLMechanism */
-	for ( i=0; supportedSASLMechanisms[i] != NULL; i++ ) {
-		val.bv_val = supportedSASLMechanisms[i];
-		val.bv_len = strlen( val.bv_val );
-		attr_merge( e, "supportedSASLMechanism", vals );
+	if( supportedSASLMechanisms != NULL ) {
+		for ( i=0; supportedSASLMechanisms[i] != NULL; i++ ) {
+			val.bv_val = supportedSASLMechanisms[i];
+			val.bv_len = strlen( val.bv_val );
+			attr_merge( e, "supportedSASLMechanisms", vals );
+		}
 	}
 
 	if ( default_referral != NULL ) {
 		attr_merge( e, "ref", default_referral );
 	}
 
-	send_search_entry( &backends[0], conn, op, e, attrs, attrsonly, 1 );
-	send_search_result( conn, op, LDAP_SUCCESS, NULL, NULL, NULL, 1 );
+	val.bv_val = "top";
+	val.bv_len = sizeof("top")-1;
+	attr_merge( e, "objectClass", vals );
+
+	val.bv_val = "LDAPsubentry";
+	val.bv_len = sizeof("LDAPsubentry")-1;
+	attr_merge( e, "objectClass", vals );
+
+	val.bv_val = "extensibleObject";
+	val.bv_len = sizeof("extensibleObject")-1;
+	attr_merge( e, "objectClass", vals );
+
+	send_search_entry( &backends[0], conn, op,
+		e, attrs, attrsonly, NULL );
+	send_search_result( conn, op, LDAP_SUCCESS,
+		NULL, NULL, NULL, NULL, 1 );
 
 	entry_free( e );
 }