--- servers/slapd/root_dse.c 2002/02/15 15:33:44 1.61 +++ servers/slapd/root_dse.c 2002/07/28 19:17:38 1.61.2.4 @@ -1,4 +1,4 @@ -/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.60 2002/02/15 15:27:31 hyc Exp $ */ +/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.61.2.3 2002/06/20 20:12:31 kurt Exp $ */ /* root_dse.c - Provides the ROOT DSA-Specific Entry * * Copyright 1999-2002 The OpenLDAP Foundation. @@ -17,15 +17,14 @@ #include "slap.h" #include - -#define BVC(x) {sizeof(x)-1, x} +#include "lber_pvt.h" static struct berval supportedFeatures[] = { - BVC("1.3.6.1.4.1.4203.1.5.1"), /* all Operational Attributes ("+") */ - BVC("1.3.6.1.4.1.4203.1.5.2"), /* OCs in Attributes List */ - BVC("1.3.6.1.4.1.4203.1.5.3"), /* (&) and (|) search filters */ - BVC("1.3.6.1.4.1.4203.1.5.4"), /* Language Tag Options */ - BVC("1.3.6.1.4.1.4203.1.5.5"), /* Language Range Options */ + BER_BVC(LDAP_FEATURE_ALL_OPERATIONAL_ATTRS), /* all Operational Attributes ("+") */ + BER_BVC(LDAP_FEATURE_OBJECTCLASS_ATTRS), /* OCs in Attributes List */ + BER_BVC(LDAP_FEATURE_ABSOLUTE_FILTERS), /* (&) and (|) search filters */ + BER_BVC(LDAP_FEATURE_LANGUAGE_TAG_OPTIONS), /* Language Tag Options */ + BER_BVC(LDAP_FEATURE_LANGUAGE_RANGE_OPTIONS), /* Language Range Options */ {0,NULL} }; @@ -37,7 +36,6 @@ root_dse_info( Entry **entry, const char **text ) { - char buf[BUFSIZ]; Entry *e; struct berval vals[2], *bv; int i, j; @@ -59,6 +57,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; @@ -78,10 +78,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 ); @@ -89,13 +85,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 ); } } @@ -119,13 +121,14 @@ root_dse_info( /* supportedLDAPVersion */ for ( i=LDAP_VERSION_MIN; i<=LDAP_VERSION_MAX; i++ ) { + char buf[BUFSIZ]; if (!( global_allows & SLAP_ALLOW_BIND_V2 ) && ( i < LDAP_VERSION3 ) ) { /* version 2 and lower are disallowed */ continue; } - sprintf(buf,"%d",i); + snprintf(buf, sizeof buf, "%d", i); vals[0].bv_val = buf; vals[0].bv_len = strlen( vals[0].bv_val ); attr_merge( e, ad_supportedLDAPVersion, vals );