Fix IRIX sc_mask conflict

[openldap] / servers / slapd / root_dse.c

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index d066423ed52c4ca6930fc17c50c867a29736febc..62c2fc7cf05c673f080062a4b4f25f9ddcb6bb14 100644 (file)
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -17,12 +17,15 @@
 
 #include "slap.h"
 #include <ldif.h>
-
-static char *supportedFeatures[] = {
-       "1.3.6.1.4.1.4203.1.5.1", /* all Operational Attributes ("+") */
-       "1.3.6.1.4.1.4203.1.5.2", /* OCs in Attributes List */
-       "1.3.6.1.4.1.4203.1.5.3", /* (&) and (|) search filters */
-       NULL
+#include "lber_pvt.h"
+
+static struct berval supportedFeatures[] = {
+       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}
 };
 
 static Entry   *usr_attr = NULL;
@@ -33,9 +36,8 @@ root_dse_info(
        Entry **entry,
        const char **text )
 {
-       char buf[BUFSIZ];
        Entry           *e;
-       struct berval   vals[2];
+       struct berval   vals[2], *bv;
        int             i, j;
        char ** supportedSASLMechanisms;
 
@@ -55,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;
 
@@ -74,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 );
@@ -85,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 );
                }
        }
@@ -105,27 +111,24 @@ root_dse_info(
        }
 
        /* supportedExtension */
-       for ( i=0; (vals[0].bv_val = get_supported_extop(i)) != NULL; i++ ) {
-               vals[0].bv_len = strlen( vals[0].bv_val );
+       for ( i=0; (bv = get_supported_extop(i)) != NULL; i++ ) {
+               vals[0] = *bv;
                attr_merge( e, ad_supportedExtension, vals );
        }
 
        /* supportedFeatures */
-       for ( i=0; supportedFeatures[i] != NULL; i++ ) {
-               vals[0].bv_val = supportedFeatures[i];
-               vals[0].bv_len = strlen( vals[0].bv_val );
-               attr_merge( e, ad_supportedFeatures, vals );
-       }
+       attr_merge( e, ad_supportedFeatures, supportedFeatures );
 
        /* 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 );