--- servers/slapd/root_dse.c	1999/07/24 01:39:23	1.12
+++ servers/slapd/root_dse.c	1999/11/17 00:47:49	1.21
@@ -1,3 +1,4 @@
+/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.20 1999/09/23 23:46:37 kdz Exp $ */
 /* root_dse.c - Provides the ROOT DSA-Specific Entry
  *
  * Copyright 1999 The OpenLDAP Foundation.
@@ -12,8 +13,8 @@
 #include "portable.h"
 
 #include <stdio.h>
+#include <ac/string.h>
 
-#include "ldap_defaults.h"
 #include "slap.h"
 
 void
@@ -33,7 +34,7 @@ root_dse_info( Connection *conn, Operati
 	e->e_attrs = NULL;
 	e->e_dn = ch_strdup( LDAP_ROOT_DSE );
 	e->e_ndn = ch_strdup( LDAP_ROOT_DSE );
-	(void) dn_normalize_case( e->e_ndn );
+	(void) dn_normalize( e->e_ndn );
 	e->e_private = NULL;
 
 	for ( i = 0; i < nbackends; i++ ) {
@@ -88,10 +89,12 @@ 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, "supportedSASLMechanisms", 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 ) {
@@ -102,8 +105,12 @@ root_dse_info( Connection *conn, Operati
 	val.bv_len = sizeof("top")-1;
 	attr_merge( e, "objectClass", vals );
 
-	val.bv_val = "extenisbleObject";
-	val.bv_len = sizeof("extenisbleObject")-1;
+	val.bv_val = "LDAProotDSE";
+	val.bv_len = sizeof("LDAProotDSE")-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,