X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Froot_dse.c;h=13e7a9258a1c018abca4519a37cad61954767eb0;hb=48b63d4f165269f29c35f89cceddd880c3966ef5;hp=f609e7114223e21b80ad7dbdeb16946029c477cf;hpb=97bc10753776fb384d94d49608961043cb7f8b4b;p=openldap

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index f609e71142..13e7a9258a 100644
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -19,8 +19,8 @@
 void
 root_dse_info( Connection *conn, Operation *op, char **attrs, int attrsonly )
 {
+	char buf[BUFSIZ];
 	Entry		*e;
-	char		buf[BUFSIZ];
 	struct berval	val;
 	struct berval	*vals[2];
 	int		i, j;
@@ -32,56 +32,50 @@ root_dse_info( Connection *conn, Operation *op, char **attrs, int attrsonly )
 
 	e->e_attrs = NULL;
 	e->e_dn = ch_strdup( LDAP_ROOT_DSE );
-	e->e_ndn = dn_normalize_case( ch_strdup( LDAP_ROOT_DSE ));
+	e->e_ndn = ch_strdup( LDAP_ROOT_DSE );
+	(void) dn_normalize_case( e->e_ndn );
 	e->e_private = NULL;
 
 	for ( i = 0; i < nbackends; i++ ) {
 		for ( j = 0; backends[i].be_suffix[j] != NULL; j++ ) {
-			strcpy( buf, backends[i].be_suffix[j] );
-			val.bv_val = buf;
-			val.bv_len = strlen( buf );
+			val.bv_val = backends[i].be_suffix[j];
+			val.bv_len = strlen( val.bv_val );
 			attr_merge( e, "namingContexts", vals );
 		}
 	}
 
 #if defined( SLAPD_MONITOR_DN )
-	strcpy( buf, SLAPD_MONITOR_DN );
-	val.bv_val = buf;
-	val.bv_len = strlen( buf );
+	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 )
-	strcpy( buf, SLAPD_CONFIG_DN );
-	val.bv_val = buf;
-	val.bv_len = strlen( buf );
+	val.bv_val = SLAPD_CONFIG_DN;
+	val.bv_len = strlen( val.bv_val );
 	attr_merge( e, "namingContexts", vals );
 #endif
 
 #if defined( SLAPD_SCHEMA_DN )
-	strcpy( buf, SLAPD_SCHEMA_DN );
-	val.bv_val = buf;
+	val.bv_val = SLAPD_SCHEMA_DN;
 	val.bv_len = strlen( val.bv_val );
 	attr_merge( e, "namingContexts", vals );
-	attr_merge( e, "subschemaSubentry", vals );
-	ldap_memfree( val.bv_val );
 #endif
 
 	/* altServer unsupported */
 
 	/* supportedControl */
 	for ( i=0; supportedControls[i] != NULL; i++ ) {
-		strcpy( buf, supportedControls[i] );
-		val.bv_val = buf;
-		val.bv_len = strlen( buf );
+		val.bv_val = supportedControls[i];
+		val.bv_len = strlen( val.bv_val );
 		attr_merge( e, "supportedControl", vals );
 	}
 
 	/* supportedExtension */
 	for ( i=0; supportedExtensions[i] != NULL; i++ ) {
-		strcpy( buf, supportedExtensions[i] );
-		val.bv_val = buf;
-		val.bv_len = strlen( buf );
+		val.bv_val = supportedExtensions[i];
+		val.bv_len = strlen( val.bv_val );
 		attr_merge( e, "supportedExtension", vals );
 	}
 
@@ -89,21 +83,35 @@ root_dse_info( Connection *conn, Operation *op, char **attrs, int attrsonly )
 	for ( i=LDAP_VERSION_MIN; i<=LDAP_VERSION_MAX; i++ ) {
 		sprintf(buf,"%d",i);
 		val.bv_val = buf;
-		val.bv_len = strlen( buf );
+		val.bv_len = strlen( val.bv_val );
 		attr_merge( e, "supportedLDAPVersion", vals );
 	}
 
 	/* supportedSASLMechanism */
-	for ( i=0; supportedSASLMechanisms[i] != NULL; i++ ) {
-		strcpy( buf, supportedSASLMechanisms[i] );
-		val.bv_val = buf;
-		val.bv_len = strlen( buf );
-		attr_merge( e, "supportedSASLMechanism", vals );
+	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 );
+		}
+	}
+
+	if ( default_referral != NULL ) {
+		attr_merge( e, "ref", default_referral );
 	}
 
+	val.bv_val = "top";
+	val.bv_len = sizeof("top")-1;
+	attr_merge( e, "objectClass", vals );
+
+	val.bv_val = "extenisbleObject";
+	val.bv_len = sizeof("extenisbleObject")-1;
+	attr_merge( e, "objectClass", vals );
 
-	send_search_entry( &backends[0], conn, op, e, attrs, attrsonly );
-	send_ldap_search_result( conn, op, LDAP_SUCCESS, NULL, NULL, 1 );
+	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 );
 }