ITS#1716 is_entry_subentr/ies/y/

[openldap] / servers / slapd / root_dse.c

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index 49f8502b9f753511f115ff445c237c40ce7e738d..939761e1415dff336a0328a667fcdeaf34be5e86 100644 (file)
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* root_dse.c - Provides the ROOT DSA-Specific Entry
  *
- * Copyright 1999-2000 The OpenLDAP Foundation.
+ * Copyright 1999-2002 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted only
@@ -18,11 +18,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
+#define BVC(x) {sizeof(x)-1, x}
+
+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 */
+       {0,NULL}
 };
 
 static Entry   *usr_attr = NULL;
@@ -35,7 +39,7 @@ root_dse_info(
 {
        char buf[BUFSIZ];
        Entry           *e;
-       struct berval   vals[2];
+       struct berval   vals[2], *bv;
        int             i, j;
        char ** supportedSASLMechanisms;
 
@@ -58,8 +62,6 @@ root_dse_info(
        AttributeDescription *ad_ref
                = slap_schema.si_ad_ref;
 
-       Attribute *a;
-
        vals[1].bv_val = NULL;
 
        e = (Entry *) ch_calloc( 1, sizeof(Entry) );
@@ -89,8 +91,9 @@ root_dse_info(
        attr_merge( e, ad_objectClass, vals );
 
        for ( i = 0; i < nbackends; i++ ) {
-               if ( backends[i].be_glueflags & SLAP_GLUE_SUBORDINATE )
+               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];
                        attr_merge( e, ad_namingContexts, vals );
@@ -100,24 +103,19 @@ root_dse_info(
        /* altServer unsupported */
 
        /* supportedControl */
-       for ( i=0; supportedControls[i] != NULL; i++ ) {
-               vals[0].bv_val = supportedControls[i];
+       for ( i=0; (vals[0].bv_val = get_supported_ctrl(i)) != NULL; i++ ) {
                vals[0].bv_len = strlen( vals[0].bv_val );
                attr_merge( e, ad_supportedControl, vals );
        }
 
        /* 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++ ) {
@@ -150,7 +148,8 @@ root_dse_info(
        }
 
        if( usr_attr != NULL) {
-               for(a = usr_attr->e_attrs; a != NULL; a = a->a_next) {
+               Attribute *a;
+               for( a = usr_attr->e_attrs; a != NULL; a = a->a_next ) {
                        attr_merge( e, a->a_desc, a->a_vals );
                }
        }
@@ -171,8 +170,6 @@ int read_root_dse_file( const char *fname )
        int rc = 0, lineno = 0, lmax = 0;
        char    *buf = NULL;
 
-       Attribute *a;
-
        if ( (fp = fopen( fname, "r" )) == NULL ) {
                Debug( LDAP_DEBUG_ANY,
                        "could not open rootdse attr file \"%s\" - absolute path?\n",
@@ -186,6 +183,7 @@ int read_root_dse_file( const char *fname )
 
        while( ldif_read_record( fp, &lineno, &buf, &lmax ) ) {
                Entry *e = str2entry( buf );
+               Attribute *a;
 
                if( e == NULL ) {
                        fprintf( stderr, "root_dse: could not parse entry (line=%d)\n",