[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha5-501-g02d6645

[Andrew Bartlett]

The branch, v4-0-test has been updated
       via  02d6645efc84179efd652dd29ab32f62ae310147 (commit)
      from  2d4103518ab8a7286e65347b8b9b0ccb660e69f6 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 02d6645efc84179efd652dd29ab32f62ae310147
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Sep 11 12:36:58 2008 +1000

    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

-----------------------------------------------------------------------

Summary of changes:
 source/dsdb/schema/schema_description.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/dsdb/schema/schema_description.c b/source/dsdb/schema/schema_description.c
index a40de37..6884c52 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);


-- 
Samba Shared Repository