Make cn=aggregate output less pretty, by more like Win2008.
authorAndrew Bartlett <abartlet@samba.org>
Thu, 11 Sep 2008 02:36:58 +0000 (12:36 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 11 Sep 2008 02:36:58 +0000 (12:36 +1000)
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)

source4/dsdb/schema/schema_description.c

index a40de37f8e37f2820dbfe0b017d1b15ae88c0d7f..6884c5284e4d74614279fb64c84fd0bad5685f05 100644 (file)
@@ -221,7 +221,7 @@ char *schema_class_description(TALLOC_CTX *mem_ctx,
        
        if (must) {
                schema_entry = talloc_asprintf_append(schema_entry, 
        
        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);
                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, 
        
        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);
                IF_NULL_FAIL_RET(schema_entry);
                
                APPEND_ATTRS(may);