[SCM] Samba Shared Repository - branch master updated - 551e95502765bae58d5ccf57635e4977b7b47b9b

[Andrew Bartlett]

The branch, master has been updated
       via  551e95502765bae58d5ccf57635e4977b7b47b9b (commit)
       via  9dcbddd5c61e8bf2814e97e53e7c518df87661c0 (commit)
      from  4746f79d50d804b0e9d5d5cc0d4796dee54d052c (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 551e95502765bae58d5ccf57635e4977b7b47b9b
Merge: 9dcbddd5c61e8bf2814e97e53e7c518df87661c0 4746f79d50d804b0e9d5d5cc0d4796dee54d052c
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Oct 14 11:16:59 2008 +1100

    Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel

commit 9dcbddd5c61e8bf2814e97e53e7c518df87661c0
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Tue Oct 14 11:02:42 2008 +1100

    The ldb async merge broke all MMC management utilties
    
    Commit 51baa8deec00244cc0a6e3d29c53932427800610 included a
    copy-and-paste bug which caused all MMC mangement utilities to break.
    
    Because of the typo Samba4 would no longer include the magic 'you may
    write to these attributes/create these classes' attributes, these
    tools would display all fields greyed out or 'read only', and not
    allow the creation of child objects.
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>

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

Summary of changes:
 source4/dsdb/samdb/ldb_modules/kludge_acl.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/samdb/ldb_modules/kludge_acl.c b/source4/dsdb/samdb/ldb_modules/kludge_acl.c
index 865e1c7..6acbf45 100644
--- a/source4/dsdb/samdb/ldb_modules/kludge_acl.c
+++ b/source4/dsdb/samdb/ldb_modules/kludge_acl.c
@@ -250,14 +250,14 @@ static int kludge_acl_callback(struct ldb_request *req, struct ldb_reply *ares)
 			case SECURITY_SYSTEM:
 				if (ac->allowedAttributesEffective) {
 					ret = kludge_acl_allowedAttributes(ac->module->ldb, ares->message,
-									"allowedClassesAttributesEffective");
+									"allowedAttributesEffective");
 					if (ret != LDB_SUCCESS) {
 						return ldb_module_done(ac->req, NULL, NULL, ret);
 					}
 				}
 				if (ac->allowedChildClassesEffective) {
 					ret = kludge_acl_childClasses(ac->module->ldb, ares->message,
-									"allowedClassesChildClassesEffective");
+									"allowedChildClassesEffective");
 					if (ret != LDB_SUCCESS) {
 						return ldb_module_done(ac->req, NULL, NULL, ret);
 					}
@@ -267,14 +267,14 @@ static int kludge_acl_callback(struct ldb_request *req, struct ldb_reply *ares)
 			case SECURITY_ADMINISTRATOR:
 				if (ac->allowedAttributesEffective) {
 					ret = kludge_acl_allowedAttributes(ac->module->ldb, ares->message,
-									"allowedClassesAttributesEffective");
+									"allowedAttributesEffective");
 					if (ret != LDB_SUCCESS) {
 						return ldb_module_done(ac->req, NULL, NULL, ret);
 					}
 				}
 				if (ac->allowedChildClassesEffective) {
 					ret = kludge_acl_childClasses(ac->module->ldb, ares->message,
-									"allowedClassesChildClassesEffective");
+									"allowedChildClassesEffective");
 					if (ret != LDB_SUCCESS) {
 						return ldb_module_done(ac->req, NULL, NULL, ret);
 					}


-- 
Samba Shared Repository