Fix pkiUser

[openldap] / servers / slapd / root_dse.c

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index b52e3558b499e1dcf6904203d5aeaec1bcfaabce..e814c5155d648a5768f3dc2c989f8224f6835483 100644 (file)
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -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,13 +86,19 @@ 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 ) {
                        continue;
                }
-               for ( j = 0; backends[i].be_suffix[j] != NULL; j++ ) {
-                       vals[0] = *backends[i].be_suffix[j];
+               for ( j = 0; backends[i].be_suffix[j].bv_val != NULL; j++ ) {
+                       vals[0] = backends[i].be_suffix[j];
                        attr_merge( e, ad_namingContexts, vals );
                }
        }