The ldb async merge broke all MMC management utilties

[samba.git] / source4 / dsdb / samdb / ldb_modules / kludge_acl.c

diff --git a/source4/dsdb/samdb/ldb_modules/kludge_acl.c b/source4/dsdb/samdb/ldb_modules/kludge_acl.c
index 6e6da5581d628488fc2b5d44f607f3abf91b778b..6acbf45afd8653c7c526fa18b92cf6f4a6b52225 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/kludge_acl.c
+++ b/source4/dsdb/samdb/ldb_modules/kludge_acl.c
@@ -141,7 +141,7 @@ static int kludge_acl_allowedAttributes(struct ldb_context *ldb, struct ldb_mess
                ldb_msg_add_string(msg, attrName, attr_list[i]);
        }
        talloc_free(mem_ctx);
-       return 0;
+       return LDB_SUCCESS;
 
 }
 /* read all objectClasses */
@@ -201,7 +201,7 @@ static int kludge_acl_childClasses(struct ldb_context *ldb, struct ldb_message *
                }
        }
 
-       return 0;
+       return LDB_SUCCESS;
 
 }
 
@@ -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);
                                        }