X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Froot_dse.c;h=942364e0057d1ab42f18868ae64a0c2039633341;hb=b44cc963c2b021821ccac582054e2ffa04f4f1e1;hp=c45a35481ecb2fff977f9ca2f917e473b89e8af7;hpb=0de4adaf09d56378eaaee63291dd78c67935e2c3;p=openldap

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index c45a35481e..942364e005 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 The OpenLDAP Foundation.
+ * Copyright 1999-2000 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted only
@@ -17,14 +17,26 @@
 
 #include "slap.h"
 
-void
-root_dse_info( Connection *conn, Operation *op, char **attrs, int attrsonly )
+int
+root_dse_info(
+	Connection *conn,
+	Entry **entry,
+	const char **text )
 {
 	char buf[BUFSIZ];
 	Entry		*e;
 	struct berval	val;
 	struct berval	*vals[2];
 	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_ref = slap_schema.si_ad_ref;
 
 	vals[0] = &val;
 	vals[1] = NULL;
@@ -37,87 +49,67 @@ root_dse_info( Connection *conn, Operation *op, char **attrs, int attrsonly )
 	(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 );
+
+	val.bv_val = "OpenLDAProotDSE";
+	val.bv_len = sizeof("OpenLDAProotDSE")-1;
+	attr_merge( e, ad_objectClass, vals );
+
 	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, "namingContexts", vals );
+			attr_merge( e, ad_namingContexts, vals );
 		}
 	}
 
-#if defined( SLAPD_MONITOR_DN )
-	val.bv_val = SLAPD_MONITOR_DN;
-	val.bv_len = strlen( val.bv_val );
-	attr_merge( e, "namingContexts", vals );
-	/* subschemasubentry is added by send_search_entry() */
-#endif
-
-#if defined( SLAPD_CONFIG_DN )
-	val.bv_val = SLAPD_CONFIG_DN;
-	val.bv_len = strlen( val.bv_val );
-	attr_merge( e, "namingContexts", vals );
-#endif
-
-#if defined( SLAPD_SCHEMA_DN )
-	val.bv_val = SLAPD_SCHEMA_DN;
-	val.bv_len = strlen( val.bv_val );
-	attr_merge( e, "namingContexts", vals );
-#endif
-
 	/* 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, "supportedControl", vals );
+		attr_merge( e, ad_supportedControl, vals );
 	}
 
 	/* supportedExtension */
-	for ( i=0; supportedExtensions[i] != NULL; i++ ) {
-		val.bv_val = supportedExtensions[i];
+	for ( i=0; (val.bv_val = get_supported_extop(i)) != NULL; i++ ) {
 		val.bv_len = strlen( val.bv_val );
-		attr_merge( e, "supportedExtension", vals );
+		attr_merge( e, ad_supportedExtension, vals );
 	}
 
 	/* supportedLDAPVersion */
 	for ( i=LDAP_VERSION_MIN; i<=LDAP_VERSION_MAX; i++ ) {
+		if (( global_disallows & SLAP_DISALLOW_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, "supportedLDAPVersion", vals );
+		attr_merge( e, ad_supportedLDAPVersion, vals );
 	}
 
 	/* supportedSASLMechanism */
+	supportedSASLMechanisms = slap_sasl_mechs( conn );
+
 	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, "supportedSASLMechanisms", vals );
+			attr_merge( e, ad_supportedSASLMechanisms, vals );
 		}
 	}
 
 	if ( default_referral != NULL ) {
-		attr_merge( e, "ref", default_referral );
+		attr_merge( e, ad_ref, default_referral );
 	}
 
-	val.bv_val = "top";
-	val.bv_len = sizeof("top")-1;
-	attr_merge( e, "objectClass", vals );
-
-	val.bv_val = "LDAProotDSE";
-	val.bv_len = sizeof("LDAProotDSE")-1;
-	attr_merge( e, "objectClass", vals );
-
-	val.bv_val = "extensibleObject";
-	val.bv_len = sizeof("extensibleObject")-1;
-	attr_merge( e, "objectClass", vals );
-
-	send_search_entry( &backends[0], conn, op,
-		e, attrs, attrsonly, NULL );
-	send_search_result( conn, op, LDAP_SUCCESS,
-		NULL, NULL, NULL, NULL, 1 );
-
-	entry_free( e );
+	*entry = e;
+	return LDAP_SUCCESS;
 }