summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-09-11 12:36:58 +1000
committerAndrew Bartlett <abartlet@samba.org>2008-09-11 12:36:58 +1000
commitd30caa011cb86d23ed2201489520454d21d14b85 (patch)
tree1893656ef2902e068f5b3a751cdde6925deb49aa
parent0cbfc686c4d8b8362de5980aecec3151b71838cc (diff)
downloadsamba-d30caa011cb86d23ed2201489520454d21d14b85.tar.gz
samba-d30caa011cb86d23ed2201489520454d21d14b85.tar.bz2
samba-d30caa011cb86d23ed2201489520454d21d14b85.zip
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 (This used to be commit 02d6645efc84179efd652dd29ab32f62ae310147)
-rw-r--r--source4/dsdb/schema/schema_description.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/dsdb/schema/schema_description.c b/source4/dsdb/schema/schema_description.c
index a40de37f8e..6884c5284e 100644
--- a/source4/dsdb/schema/schema_description.c
+++ b/source4/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);