--- servers/slapd/root_dse.c	2002/06/19 04:06:21	1.64
+++ servers/slapd/root_dse.c	2002/06/19 04:44:17	1.65
@@ -1,4 +1,4 @@
-/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.63 2002/05/01 16:50:14 hyc Exp $ */
+/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.64 2002/06/19 04:06:21 kurt Exp $ */
 /* root_dse.c - Provides the ROOT DSA-Specific Entry
  *
  * Copyright 1999-2002 The OpenLDAP Foundation.
@@ -58,6 +58,8 @@ root_dse_info(
 		= slap_schema.si_ad_supportedSASLMechanisms;
 	AttributeDescription *ad_supportedFeatures
 		= slap_schema.si_ad_supportedFeatures;
+	AttributeDescription *ad_monitorContext
+		= slap_schema.si_ad_monitorContext;
 	AttributeDescription *ad_ref
 		= slap_schema.si_ad_ref;
 
@@ -77,10 +79,6 @@ root_dse_info(
 
 	e->e_private = NULL;
 
-	vals[0].bv_val = "OpenLDAProotDSE";
-	vals[0].bv_len = sizeof("OpenLDAProotDSE")-1;
-	attr_merge( e, ad_structuralObjectClass, vals );
-
 	vals[0].bv_val = "top";
 	vals[0].bv_len = sizeof("top")-1;
 	attr_merge( e, ad_objectClass, vals );
@@ -88,9 +86,12 @@ root_dse_info(
 	vals[0].bv_val = "OpenLDAProotDSE";
 	vals[0].bv_len = sizeof("OpenLDAProotDSE")-1;
 	attr_merge( e, ad_objectClass, vals );
+	attr_merge( e, ad_structuralObjectClass, vals );
 
 	for ( i = 0; i < nbackends; i++ ) {
 		if ( backends[i].be_flags & SLAP_BFLAG_MONITOR ) {
+			vals[0] = backends[i].be_suffix[0];
+			attr_merge( e, ad_monitorContext, vals );
 			continue;
 		}
 		if ( backends[i].be_flags & SLAP_BFLAG_GLUE_SUBORDINATE ) {