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

[kai/samba.git] / source / dsdb / schema / schema_description.c

diff --git a/source/dsdb/schema/schema_description.c b/source/dsdb/schema/schema_description.c
index 9d93af9260a87ccfbfe5b4bb0257441cec35fe62..6884c5284e4d74614279fb64c84fd0bad5685f05 100644 (file)
--- a/source/dsdb/schema/schema_description.c
+++ b/source/dsdb/schema/schema_description.c
@@ -182,7 +182,7 @@ char *schema_class_description(TALLOC_CTX *mem_ctx,
                IF_NULL_FAIL_RET(schema_entry);
        }
 
-       if (subClassOf) {
+       if (subClassOf && strcasecmp(subClassOf, name) != 0) {
                schema_entry = talloc_asprintf_append(schema_entry, 
                                                      "SUP %s%s", subClassOf, seperator);
                IF_NULL_FAIL_RET(schema_entry);
@@ -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);