X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Froot_dse.c;h=5357ed46fb5af7b9dfc852dd59796f67f930889e;hb=ca9bb44089145bdb7435135714590d48f4a6eabd;hp=e7a80d0150cdc20b4864451c802f780d3e54c72e;hpb=8502301b006e170acbc4ae9ee7aa6871f9fc79f4;p=openldap

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index e7a80d0150..5357ed46fb 100644
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -43,9 +43,7 @@ root_dse_info(
 {
 	Entry		*e;
 	struct berval vals[2], *bv;
-#ifdef SLAP_NVALUES
 	struct berval nvals[2];
-#endif
 	int		i, j;
 	char ** supportedSASLMechanisms;
 
@@ -55,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
@@ -71,9 +67,7 @@ root_dse_info(
 		= slap_schema.si_ad_ref;
 
 	vals[1].bv_val = NULL;
-#ifdef SLAP_NVALUES
 	nvals[1].bv_val = NULL;
-#endif
 
 	e = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) );
 
@@ -102,53 +96,35 @@ root_dse_info(
 
 	vals[0].bv_val = "top";
 	vals[0].bv_len = sizeof("top")-1;
-#ifdef SLAP_NVALUES
-	if( attr_merge( e, ad_objectClass, vals, vals ) )
-#else
-	if( attr_merge( e, ad_objectClass, vals ) )
-#endif
+	if( attr_merge( e, ad_objectClass, vals, NULL ) )
 	{
 		return LDAP_OTHER;
 	}
 
 	vals[0].bv_val = "OpenLDAProotDSE";
 	vals[0].bv_len = sizeof("OpenLDAProotDSE")-1;
-#ifdef SLAP_NVALUES
-	if( attr_merge( e, ad_objectClass, vals, vals ) )
-#else
-	if( attr_merge( e, ad_objectClass, vals ) )
-#endif
+	if( attr_merge( e, ad_objectClass, vals, NULL ) )
 		return LDAP_OTHER;
-#ifdef SLAP_NVALUES
-	if( attr_merge( e, ad_structuralObjectClass, vals, vals ) )
-#else
-	if( attr_merge( e, ad_structuralObjectClass, vals ) )
-#endif
+	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];
-#ifdef SLAP_NVALUES
+			nvals[0] = backends[i].be_nsuffix[0];
 			if( attr_merge( e, ad_monitorContext, vals, nvals ) )
-#else
-			if( attr_merge( e, ad_monitorContext, vals ) )
-#endif
 			{
 				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];
-#ifdef SLAP_NVALUES
-			if( attr_merge( e, ad_namingContexts, vals, NULL ) )
-#else
-			if( attr_merge( e, ad_namingContexts, vals ) )
-#endif
+			nvals[0] = backends[i].be_nsuffix[0];
+			if( attr_merge( e, ad_namingContexts, vals, nvals ) )
 			{
 				return LDAP_OTHER;
 			}
@@ -158,26 +134,14 @@ root_dse_info(
 	/* 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 );
-#ifdef SLAP_NVALUES
-		if( attr_merge( e, ad_supportedControl, vals, NULL ) )
-#else
-		if( attr_merge( e, ad_supportedControl, vals ) )
-#endif
-		{
-			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;
-#ifdef SLAP_NVALUES
 		if( attr_merge( e, ad_supportedExtension, vals, NULL ) )
-#else
-		if( attr_merge( e, ad_supportedExtension, vals ) )
-#endif
 		{
 			return LDAP_OTHER;
 		}
@@ -187,11 +151,7 @@ root_dse_info(
 	/* netscape supportedExtension */
 	for ( i = 0; (bv = ns_get_supported_extop(i)) != NULL; i++ ) {
 		vals[0] = *bv;
-#ifdef SLAP_NVALUES
 		if( attr_merge( e, ad_supportedExtension, vals, NULL ))
-#else
-		if( attr_merge( e, ad_supportedExtension, vals ))
-#endif
 		{
 			return LDAP_OTHER;
 		}
@@ -199,12 +159,8 @@ root_dse_info(
 #endif /* LDAP_SLAPI */
 
 	/* supportedFeatures */
-#ifdef SLAP_NVALUES
 	if( attr_merge( e, ad_supportedFeatures,
-		supportedFeatures, supportedFeatures ) )
-#else
-	if( attr_merge( e, ad_supportedFeatures, supportedFeatures ) )
-#endif
+		supportedFeatures, NULL ) )
 	{
 		return LDAP_OTHER;
 	}
@@ -221,11 +177,7 @@ root_dse_info(
 		snprintf(buf, sizeof buf, "%d", i);
 		vals[0].bv_val = buf;
 		vals[0].bv_len = strlen( vals[0].bv_val );
-#ifdef SLAP_NVALUES
 		if( attr_merge( e, ad_supportedLDAPVersion, vals, NULL ) )
-#else
-		if( attr_merge( e, ad_supportedLDAPVersion, vals ) )
-#endif
 		{
 			return LDAP_OTHER;
 		}
@@ -238,11 +190,7 @@ 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 );
-#ifdef SLAP_NVALUES
 			if( attr_merge( e, ad_supportedSASLMechanisms, vals, NULL ) )
-#else
-			if( attr_merge( e, ad_supportedSASLMechanisms, vals ) )
-#endif
 			{
 				return LDAP_OTHER;
 			}
@@ -251,11 +199,7 @@ root_dse_info(
 	}
 
 	if ( default_referral != NULL ) {
-#ifdef SLAP_NVALUES
 		if( attr_merge( e, ad_ref, default_referral, NULL /* FIXME */ ) )
-#else
-		if( attr_merge( e, ad_ref, default_referral ) )
-#endif
 		{
 			return LDAP_OTHER;
 		}
@@ -264,11 +208,8 @@ root_dse_info(
 	if( usr_attr != NULL) {
 		Attribute *a;
 		for( a = usr_attr->e_attrs; a != NULL; a = a->a_next ) {
-#ifdef SLAP_NVALUES
-			if( attr_merge( e, a->a_desc, a->a_vals, a->a_nvals ) )
-#else
-			if( attr_merge( e, a->a_desc, a->a_vals ) )
-#endif
+			if( attr_merge( e, a->a_desc, a->a_vals,
+			 (a->a_nvals == a->a_vals) ? NULL : a->a_nvals ) )
 			{
 				return LDAP_OTHER;
 			}
@@ -308,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;
@@ -319,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 */
@@ -330,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;
 		}
 
 		/*
@@ -342,21 +282,27 @@ int read_root_dse_file( const char *fname )
 		 */
 
 		for(a = e->e_attrs; a != NULL; a = a->a_next) {
-#ifdef SLAP_NVALUES
-			if( attr_merge( usr_attr, a->a_desc, a->a_vals, a->a_nvals ) )
-#else
-			if( attr_merge( usr_attr, a->a_desc, a->a_vals ) )
-#endif
+			if( attr_merge( usr_attr, a->a_desc, a->a_vals,
+			(a->a_nvals == a->a_vals) ? NULL : a->a_nvals ) )
 			{
-				return LDAP_OTHER;
+				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;
 }