Don't add subentries of the RootDSE to namingContexts

servers/slapd/root_dse.c

@@ -45,29 +45,6 @@ root_dse_info( Connection *conn, Operation *op, char **attrs, int attrsonly )
 		}
 	}
 
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-	/* we shouldn't publish subentries as naming contexts */
-#else
-#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
-#endif
-
 	/* altServer unsupported */
 
 	/* supportedControl */
@@ -120,10 +97,6 @@ root_dse_info( Connection *conn, Operation *op, char **attrs, int attrsonly )
 	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,