From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 11 Sep 2008 02:36:58 +0000 (+1000)
Subject: Make cn=aggregate output less pretty, by more like Win2008.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02d6645efc84179efd652dd29ab32f62ae310147;p=thirdparty%2Fsamba.git

Make cn=aggregate output less pretty, by more like Win2008.

I'm not sure if this fixes bug #5713, as this is not consistantly
reproducably on my equipment.

Andrew Bartlett
---

diff --git a/source/dsdb/schema/schema_description.c b/source/dsdb/schema/schema_description.c
index a40de37f8e3..6884c5284e4 100644
--- a/source/dsdb/schema/schema_description.c
+++ b/source/dsdb/schema/schema_description.c
@@ -221,7 +221,7 @@ char *schema_class_description(TALLOC_CTX *mem_ctx,
 	
 	if (must) {
 		schema_entry = talloc_asprintf_append(schema_entry, 
-						      "MUST ( ");
+						      "MUST (%s", target == TARGET_AD_SCHEMA_SUBENTRY ? "" : " ");
 		IF_NULL_FAIL_RET(schema_entry);
 		
 		APPEND_ATTRS(must);
@@ -233,7 +233,7 @@ char *schema_class_description(TALLOC_CTX *mem_ctx,
 	
 	if (may) {
 		schema_entry = talloc_asprintf_append(schema_entry, 
-						      "MAY ( ");
+						      "MAY (%s", target == TARGET_AD_SCHEMA_SUBENTRY ? "" : " ");
 		IF_NULL_FAIL_RET(schema_entry);
 		
 		APPEND_ATTRS(may);