fix schema definitions (duplicate objectClass OID still there)

[openldap] / servers / slapd / root_dse.c

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index f968a6252bd65e4e9180384785b486e0c5334ceb..5357ed46fb5af7b9dfc852dd59796f67f930889e 100644 (file)
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -11,18 +11,18 @@
  */
 
 #include "portable.h"
-#include "slapi_common.h"
 
 #include <stdio.h>
+
 #include <ac/string.h>
 
 #include "slap.h"
-#include "slapi.h"
 #include <ldif.h>
 #include "lber_pvt.h"
-#include "slapi/slapi_utils.h"
 
-struct berval *ns_get_supported_extop (int);
+#ifdef LDAP_SLAPI
+#include "slapi.h"
+#endif
 
 static struct berval supportedFeatures[] = {
        BER_BVC(LDAP_FEATURE_ALL_OPERATIONAL_ATTRS), /* all Operational Attributes ("+") */
@@ -42,7 +42,8 @@ root_dse_info(
        const char **text )
 {
        Entry           *e;
-       struct berval   vals[2], *bv;
+       struct berval vals[2], *bv;
+       struct berval nvals[2];
        int             i, j;
        char ** supportedSASLMechanisms;
 
@@ -52,8 +53,6 @@ root_dse_info(
                = slap_schema.si_ad_objectClass;
        AttributeDescription *ad_namingContexts
                = slap_schema.si_ad_namingContexts;
-       AttributeDescription *ad_supportedControl
-               = slap_schema.si_ad_supportedControl;
        AttributeDescription *ad_supportedExtension
                = slap_schema.si_ad_supportedExtension;
        AttributeDescription *ad_supportedLDAPVersion
@@ -68,6 +67,7 @@ root_dse_info(
                = slap_schema.si_ad_ref;
 
        vals[1].bv_val = NULL;
+       nvals[1].bv_val = NULL;
 
        e = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) );
 
@@ -96,60 +96,74 @@ root_dse_info(
 
        vals[0].bv_val = "top";
        vals[0].bv_len = sizeof("top")-1;
-       if( attr_merge( e, ad_objectClass, vals ) )
+       if( attr_merge( e, ad_objectClass, vals, NULL ) )
+       {
                return LDAP_OTHER;
+       }
 
        vals[0].bv_val = "OpenLDAProotDSE";
        vals[0].bv_len = sizeof("OpenLDAProotDSE")-1;
-       if( attr_merge( e, ad_objectClass, vals ) )
+       if( attr_merge( e, ad_objectClass, vals, NULL ) )
                return LDAP_OTHER;
-       if( attr_merge( e, ad_structuralObjectClass, vals ) )
+       if( attr_merge( e, ad_structuralObjectClass, vals, NULL ) )
                return LDAP_OTHER;
 
        for ( i = 0; i < nbackends; i++ ) {
                if ( backends[i].be_flags & SLAP_BFLAG_MONITOR ) {
                        vals[0] = backends[i].be_suffix[0];
-                       if( attr_merge( e, ad_monitorContext, vals ) )
+                       nvals[0] = backends[i].be_nsuffix[0];
+                       if( attr_merge( e, ad_monitorContext, vals, nvals ) )
+                       {
                                return LDAP_OTHER;
+                       }
                        continue;
                }
-               if ( backends[i].be_flags & SLAP_BFLAG_GLUE_SUBORDINATE ) {
+               if ( SLAP_GLUE_SUBORDINATE( &backends[i] ) ) {
                        continue;
                }
                for ( j = 0; backends[i].be_suffix[j].bv_val != NULL; j++ ) {
                        vals[0] = backends[i].be_suffix[j];
-                       if( attr_merge( e, ad_namingContexts, vals ) )
+                       nvals[0] = backends[i].be_nsuffix[0];
+                       if( attr_merge( e, ad_namingContexts, vals, nvals ) )
+                       {
                                return LDAP_OTHER;
+                       }
                }
        }
 
        /* altServer unsupported */
 
        /* supportedControl */
-       for ( i=0; (vals[0].bv_val = get_supported_ctrl(i)) != NULL; i++ ) {
-               vals[0].bv_len = strlen( vals[0].bv_val );
-               if( attr_merge( e, ad_supportedControl, vals ) )
-                       return LDAP_OTHER;
+       if ( controls_root_dse_info( e ) != 0 ) {
+               return LDAP_OTHER;
        }
 
        /* supportedExtension */
        for ( i=0; (bv = get_supported_extop(i)) != NULL; i++ ) {
                vals[0] = *bv;
-               if( attr_merge( e, ad_supportedExtension, vals ) )
+               if( attr_merge( e, ad_supportedExtension, vals, NULL ) )
+               {
                        return LDAP_OTHER;
+               }
        }
 
-#if defined( LDAP_SLAPI )
+#ifdef LDAP_SLAPI
        /* netscape supportedExtension */
        for ( i = 0; (bv = ns_get_supported_extop(i)) != NULL; i++ ) {
                vals[0] = *bv;
-               attr_merge( e, ad_supportedExtension, vals );
+               if( attr_merge( e, ad_supportedExtension, vals, NULL ))
+               {
+                       return LDAP_OTHER;
+               }
        }
-#endif /* defined( LDAP_SLAPI ) */
+#endif /* LDAP_SLAPI */
 
        /* supportedFeatures */
-       if( attr_merge( e, ad_supportedFeatures, supportedFeatures ) )
+       if( attr_merge( e, ad_supportedFeatures,
+               supportedFeatures, NULL ) )
+       {
                return LDAP_OTHER;
+       }
 
        /* supportedLDAPVersion */
        for ( i=LDAP_VERSION_MIN; i<=LDAP_VERSION_MAX; i++ ) {
@@ -163,8 +177,10 @@ root_dse_info(
                snprintf(buf, sizeof buf, "%d", i);
                vals[0].bv_val = buf;
                vals[0].bv_len = strlen( vals[0].bv_val );
-               if( attr_merge( e, ad_supportedLDAPVersion, vals ) )
+               if( attr_merge( e, ad_supportedLDAPVersion, vals, NULL ) )
+               {
                        return LDAP_OTHER;
+               }
        }
 
        /* supportedSASLMechanism */
@@ -174,22 +190,29 @@ root_dse_info(
                for ( i=0; supportedSASLMechanisms[i] != NULL; i++ ) {
                        vals[0].bv_val = supportedSASLMechanisms[i];
                        vals[0].bv_len = strlen( vals[0].bv_val );
-                       if( attr_merge( e, ad_supportedSASLMechanisms, vals ) )
+                       if( attr_merge( e, ad_supportedSASLMechanisms, vals, NULL ) )
+                       {
                                return LDAP_OTHER;
+                       }
                }
                ldap_charray_free( supportedSASLMechanisms );
        }
 
        if ( default_referral != NULL ) {
-               if( attr_merge( e, ad_ref, default_referral ) )
+               if( attr_merge( e, ad_ref, default_referral, NULL /* FIXME */ ) )
+               {
                        return LDAP_OTHER;
+               }
        }
 
        if( usr_attr != NULL) {
                Attribute *a;
                for( a = usr_attr->e_attrs; a != NULL; a = a->a_next ) {
-                       if( attr_merge( e, a->a_desc, a->a_vals ) )
+                       if( attr_merge( e, a->a_desc, a->a_vals,
+                        (a->a_nvals == a->a_vals) ? NULL : a->a_nvals ) )
+                       {
                                return LDAP_OTHER;
+                       }
                }
        }
 
@@ -226,6 +249,7 @@ int read_root_dse_file( const char *fname )
                Debug( LDAP_DEBUG_ANY,
                        "read_root_dse_file: SLAP_CALLOC failed", 0, 0, 0 );
 #endif
+               fclose( fp );
                return LDAP_OTHER;
        }
        usr_attr->e_attrs = NULL;
@@ -237,9 +261,8 @@ int read_root_dse_file( const char *fname )
                if( e == NULL ) {
                        fprintf( stderr, "root_dse: could not parse entry (line=%d)\n",
                                lineno );
-                       entry_free( usr_attr );
-                       usr_attr = NULL;
-                       return EXIT_FAILURE;
+                       rc = EXIT_FAILURE;
+                       break;
                }
 
                /* make sure the DN is the empty DN */
@@ -248,9 +271,8 @@ int read_root_dse_file( const char *fname )
                                "root_dse: invalid rootDSE - dn=\"%s\" (line=%d)\n",
                                e->e_dn, lineno );
                        entry_free( e );
-                       entry_free( usr_attr );
-                       usr_attr = NULL;
-                       return EXIT_FAILURE;
+                       rc = EXIT_FAILURE;
+                       break;
                }
 
                /*
@@ -260,15 +282,27 @@ int read_root_dse_file( const char *fname )
                 */
 
                for(a = e->e_attrs; a != NULL; a = a->a_next) {
-                       if( attr_merge( usr_attr, a->a_desc, a->a_vals ) )
-                               return LDAP_OTHER;
+                       if( attr_merge( usr_attr, a->a_desc, a->a_vals,
+                       (a->a_nvals == a->a_vals) ? NULL : a->a_nvals ) )
+                       {
+                               rc = LDAP_OTHER;
+                               break;
+                       }
                }
 
                entry_free( e );
+               if (rc) break;
+       }
+
+       if (rc) {
+               entry_free( usr_attr );
+               usr_attr = NULL;
        }
 
        ch_free( buf );
 
+       fclose( fp );
+
        Debug(LDAP_DEBUG_CONFIG, "rootDSE file %s read.\n", fname, 0, 0);
        return rc;
 }