X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Froot_dse.c;h=86777acfaed502efc10f7f5c0f8de6033c158880;hb=ed471a4d53b9bcd2cc89410743ffb4bd58b5fc05;hp=68166471f8a8fc26d2893eae0dd673708b9b575b;hpb=e0ff8d67820e7d5c0aa4174f7e92370589317778;p=openldap

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index 68166471f8..86777acfae 100644
--- 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
@@ -11,15 +11,26 @@
  */
 
 #include "portable.h"
+#include "slapi_common.h"
 
 #include <stdio.h>
 #include <ac/string.h>
 
 #include "slap.h"
-
-static char *supportedFeatures[] = {
-	"1.3.6.1.4.1.4203.1.5.1", /* All Operational Attributes ("+") */
-	NULL
+#include "slapi.h"
+#include <ldif.h>
+#include "lber_pvt.h"
+#include "slapi/slapi_utils.h"
+
+struct berval *ns_get_supported_extop (int);
+
+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;
@@ -30,85 +41,130 @@ root_dse_info(
 	Entry **entry,
 	const char **text )
 {
-	char buf[BUFSIZ];
 	Entry		*e;
-	struct berval	val;
-	struct berval	*vals[2];
+	struct berval	vals[2], *bv;
 	int		i, j;
 	char ** supportedSASLMechanisms;
 
-	AttributeDescription *ad_objectClass = 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 = slap_schema.si_ad_supportedLDAPVersion;
-	AttributeDescription *ad_supportedSASLMechanisms = slap_schema.si_ad_supportedSASLMechanisms;
-	AttributeDescription *ad_supportedFeatures = slap_schema.si_ad_supportedFeatures;
-	AttributeDescription *ad_ref = slap_schema.si_ad_ref;
-
-	Attribute *a;
+	AttributeDescription *ad_structuralObjectClass
+		= slap_schema.si_ad_structuralObjectClass;
+	AttributeDescription *ad_objectClass
+		= 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
+		= slap_schema.si_ad_supportedLDAPVersion;
+	AttributeDescription *ad_supportedSASLMechanisms
+		= 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;
+
+	vals[1].bv_val = NULL;
+
+	e = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) );
+
+	if( e == NULL ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG( OPERATION, ERR,
+			"root_dse_info: SLAP_CALLOC failed", 0, 0, 0 );
+#else
+		Debug( LDAP_DEBUG_ANY,
+			"root_dse_info: SLAP_CALLOC failed", 0, 0, 0 );
+#endif
+		return LDAP_OTHER;
+	}
 
-	vals[0] = &val;
-	vals[1] = NULL;
+	e->e_attrs = NULL;
+	e->e_name.bv_val = ch_strdup( LDAP_ROOT_DSE );
+	e->e_name.bv_len = sizeof( LDAP_ROOT_DSE )-1;
+	e->e_nname.bv_val = ch_strdup( LDAP_ROOT_DSE );
+	e->e_nname.bv_len = sizeof( LDAP_ROOT_DSE )-1;
 
-	e = (Entry *) ch_calloc( 1, sizeof(Entry) );
+	/* the DN is an empty string so no pretty/normalization is needed */
+	assert( !e->e_name.bv_len );
+	assert( !e->e_nname.bv_len );
 
-	e->e_attrs = NULL;
-	e->e_dn = ch_strdup( LDAP_ROOT_DSE );
-	e->e_ndn = ch_strdup( LDAP_ROOT_DSE );
-	(void) dn_normalize( e->e_ndn );
 	e->e_private = NULL;
 
-	val.bv_val = "top";
-	val.bv_len = sizeof("top")-1;
-	attr_merge( e, ad_objectClass, vals );
+	vals[0].bv_val = "top";
+	vals[0].bv_len = sizeof("top")-1;
+	if( attr_merge( e, ad_objectClass, vals ) )
+		return LDAP_OTHER;
 
-	val.bv_val = "OpenLDAProotDSE";
-	val.bv_len = sizeof("OpenLDAProotDSE")-1;
-	attr_merge( e, ad_objectClass, vals );
+	vals[0].bv_val = "OpenLDAProotDSE";
+	vals[0].bv_len = sizeof("OpenLDAProotDSE")-1;
+	if( attr_merge( e, ad_objectClass, vals ) )
+		return LDAP_OTHER;
+	if( attr_merge( e, ad_structuralObjectClass, vals ) )
+		return LDAP_OTHER;
 
 	for ( i = 0; i < nbackends; i++ ) {
-		for ( j = 0; backends[i].be_suffix[j] != NULL; j++ ) {
-			val.bv_val = backends[i].be_suffix[j];
-			val.bv_len = strlen( val.bv_val );
-			attr_merge( e, ad_namingContexts, vals );
+		if ( backends[i].be_flags & SLAP_BFLAG_MONITOR ) {
+			vals[0] = backends[i].be_suffix[0];
+			if( attr_merge( e, ad_monitorContext, vals ) )
+				return LDAP_OTHER;
+			continue;
+		}
+		if ( backends[i].be_flags & SLAP_BFLAG_GLUE_SUBORDINATE ) {
+			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 ) )
+				return LDAP_OTHER;
 		}
 	}
 
 	/* altServer unsupported */
 
 	/* supportedControl */
-	for ( i=0; supportedControls[i] != NULL; i++ ) {
-		val.bv_val = supportedControls[i];
-		val.bv_len = strlen( val.bv_val );
-		attr_merge( e, ad_supportedControl, vals );
+	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;
 	}
 
 	/* supportedExtension */
-	for ( i=0; (val.bv_val = get_supported_extop(i)) != NULL; i++ ) {
-		val.bv_len = strlen( val.bv_val );
+	for ( i=0; (bv = get_supported_extop(i)) != NULL; i++ ) {
+		vals[0] = *bv;
+		if( attr_merge( e, ad_supportedExtension, vals ) )
+			return LDAP_OTHER;
+	}
+
+#if defined( LDAP_SLAPI )
+	/* netscape supportedExtension */
+	for ( i = 0; (bv = ns_get_supported_extop(i)) != NULL; i++ ) {
+		vals[0] = *bv;
 		attr_merge( e, ad_supportedExtension, vals );
 	}
+#endif /* defined( LDAP_SLAPI ) */
 
 	/* supportedFeatures */
-	for ( i=0; supportedFeatures[i] != NULL; i++ ) {
-		val.bv_val = supportedFeatures[i];
-		val.bv_len = strlen( val.bv_val );
-		attr_merge( e, ad_supportedFeatures, vals );
-	}
+	if( attr_merge( e, ad_supportedFeatures, supportedFeatures ) )
+		return LDAP_OTHER;
 
 	/* supportedLDAPVersion */
 	for ( i=LDAP_VERSION_MIN; i<=LDAP_VERSION_MAX; i++ ) {
-		if (( global_disallows & SLAP_DISALLOW_BIND_V2 ) &&
+		char buf[BUFSIZ];
+		if (!( global_allows & SLAP_ALLOW_BIND_V2 ) &&
 			( i < LDAP_VERSION3 ) )
 		{
 			/* version 2 and lower are disallowed */
 			continue;
 		}
-		sprintf(buf,"%d",i);
-		val.bv_val = buf;
-		val.bv_len = strlen( val.bv_val );
-		attr_merge( e, ad_supportedLDAPVersion, vals );
+		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 ) )
+			return LDAP_OTHER;
 	}
 
 	/* supportedSASLMechanism */
@@ -116,20 +172,24 @@ root_dse_info(
 
 	if( supportedSASLMechanisms != NULL ) {
 		for ( i=0; supportedSASLMechanisms[i] != NULL; i++ ) {
-			val.bv_val = supportedSASLMechanisms[i];
-			val.bv_len = strlen( val.bv_val );
-			attr_merge( e, ad_supportedSASLMechanisms, vals );
+			vals[0].bv_val = supportedSASLMechanisms[i];
+			vals[0].bv_len = strlen( vals[0].bv_val );
+			if( attr_merge( e, ad_supportedSASLMechanisms, vals ) )
+				return LDAP_OTHER;
 		}
-		charray_free( supportedSASLMechanisms );
+		ldap_charray_free( supportedSASLMechanisms );
 	}
 
 	if ( default_referral != NULL ) {
-		attr_merge( e, ad_ref, default_referral );
+		if( attr_merge( e, ad_ref, default_referral ) )
+			return LDAP_OTHER;
 	}
 
 	if( usr_attr != NULL) {
-		for(a = usr_attr->e_attrs; a != NULL; a = a->a_next) {
-			attr_merge( e, a->a_desc, a->a_vals );
+		Attribute *a;
+		for( a = usr_attr->e_attrs; a != NULL; a = a->a_next ) {
+			if( attr_merge( e, a->a_desc, a->a_vals ) )
+				return LDAP_OTHER;
 		}
 	}
 
@@ -146,12 +206,9 @@ root_dse_info(
 int read_root_dse_file( const char *fname )
 {
 	FILE	*fp;
-	char	*line, *savefname, *saveline;
 	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",
@@ -160,33 +217,33 @@ int read_root_dse_file( const char *fname )
 		return EXIT_FAILURE;
 	}
 
-	usr_attr = (Entry *) ch_calloc( 1, sizeof(Entry) );
+	usr_attr = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) );
+	if( usr_attr == NULL ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG( OPERATION, ERR,
+			"read_root_dse_file: SLAP_CALLOC failed", 0, 0, 0 );
+#else
+		Debug( LDAP_DEBUG_ANY,
+			"read_root_dse_file: SLAP_CALLOC failed", 0, 0, 0 );
+#endif
+		return LDAP_OTHER;
+	}
 	usr_attr->e_attrs = NULL;
 
 	while( ldif_read_record( fp, &lineno, &buf, &lmax ) ) {
-		ID id;
 		Entry *e = str2entry( buf );
+		Attribute *a;
 
 		if( e == NULL ) {
 			fprintf( stderr, "root_dse: could not parse entry (line=%d)\n",
 				lineno );
-			entry_free( e );
-			entry_free( usr_attr );
-			usr_attr = NULL;
-			return EXIT_FAILURE;
-		}
-
-		if( dn_normalize( e->e_ndn ) == NULL ) {
-			fprintf( stderr, "root_dse: invalid dn=\"%s\" (line=%d)\n",
-				e->e_dn, lineno );
-			entry_free( e );
 			entry_free( usr_attr );
 			usr_attr = NULL;
 			return EXIT_FAILURE;
 		}
 
-		/* make sure the DN is a valid rootdse(rootdse is a null string) */
-		if( strcmp(e->e_ndn, "") != 0 ) {
+		/* make sure the DN is the empty DN */
+		if( e->e_nname.bv_len ) {
 			fprintf( stderr,
 				"root_dse: invalid rootDSE - dn=\"%s\" (line=%d)\n",
 				e->e_dn, lineno );
@@ -203,7 +260,8 @@ int read_root_dse_file( const char *fname )
 		 */
 
 		for(a = e->e_attrs; a != NULL; a = a->a_next) {
-			attr_merge( usr_attr, a->a_desc, a->a_vals );
+			if( attr_merge( usr_attr, a->a_desc, a->a_vals ) )
+				return LDAP_OTHER;
 		}
 
 		entry_free( e );
@@ -211,6 +269,6 @@ int read_root_dse_file( const char *fname )
 
 	ch_free( buf );
 
-	Debug(LDAP_DEBUG_CONFIG,"rootDSE file %s read.\n", fname, 0, 0);
+	Debug(LDAP_DEBUG_CONFIG, "rootDSE file %s read.\n", fname, 0, 0);
 	return rc;
 }