s4-dsdb: move schema_load at the top of module stack

[ddiss/samba.git] / source4 / dsdb / samdb / ldb_modules / samba_dsdb.c

diff --git a/source4/dsdb/samdb/ldb_modules/samba_dsdb.c b/source4/dsdb/samdb/ldb_modules/samba_dsdb.c
index cdfc8d71839a6efce8770cef4901e0ef673ec6f7..361059f0eea79f51c65f90cc330e18003a24d20a 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/samba_dsdb.c
+++ b/source4/dsdb/samdb/ldb_modules/samba_dsdb.c
@@ -31,17 +31,15 @@
  */
 
 #include "includes.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
-#include "lib/ldb/include/ldb_module.h"
-#include "lib/ldb/include/ldb_private.h"
-
+#include <ldb.h>
+#include <ldb_errors.h>
+#include <ldb_module.h>
 #include "dsdb/samdb/ldb_modules/util.h"
 #include "dsdb/samdb/samdb.h"
 #include "librpc/ndr/libndr.h"
 
 static int read_at_rootdse_record(struct ldb_context *ldb, struct ldb_module *module, TALLOC_CTX *mem_ctx,
-                                 struct ldb_message **msg)
+                                 struct ldb_message **msg, struct ldb_request *parent)
 {
        int ret;
        static const char *rootdse_attrs[] = { "defaultNamingContext", "configurationNamingContext", "schemaNamingContext", NULL };
@@ -59,7 +57,7 @@ static int read_at_rootdse_record(struct ldb_context *ldb, struct ldb_module *mo
        }
 
        ret = dsdb_module_search_dn(module, tmp_ctx, &rootdse_res, rootdse_dn,
-                                   rootdse_attrs, DSDB_FLAG_NEXT_MODULE);
+                                   rootdse_attrs, DSDB_FLAG_NEXT_MODULE, parent);
        if (ret != LDB_SUCCESS) {
                talloc_free(tmp_ctx);
                return ret;
@@ -152,6 +150,8 @@ static int samba_dsdb_init(struct ldb_module *module)
          - extended_dn_in must be before objectclass.c, as it resolves the DN
          - objectclass must be before password_hash and samldb since these LDB
            modules require the expanded "objectClass" list
+          - objectclass must be before descriptor, as descriptor assumes that 
+            objectClass values are sorted
          - objectclass_attrs must be behind operational in order to see all
            attributes (the operational module protects and therefore
            suppresses per default some important ones)
@@ -164,7 +164,9 @@ static int samba_dsdb_init(struct ldb_module *module)
        */
        static const char *modules_list[] = {"resolve_oids",
                                             "rootdse",
+                                            "schema_load",
                                             "lazy_commit",
+                                            "dirsync",
                                             "paged_results",
                                             "ranged_results",
                                             "anr",
@@ -175,10 +177,10 @@ static int samba_dsdb_init(struct ldb_module *module)
                                             "objectclass",
                                             "descriptor",
                                             "acl",
+                                            "aclread",
                                             "samldb",
                                             "password_hash",
                                             "operational",
-                                            "schema_load",
                                             "instancetype",
                                             "objectclass_attrs",
                                             NULL };
@@ -208,9 +210,9 @@ static int samba_dsdb_init(struct ldb_module *module)
 
        const char **backend_modules;
        static const char *fedora_ds_backend_modules[] = {
-               "nsuniqueid", "paged_searches", NULL };
+               "nsuniqueid", "paged_searches", "simple_dn", NULL };
        static const char *openldap_backend_modules[] = {
-               "entryuuid", "paged_searches", NULL };
+               "entryuuid", "paged_searches", "simple_dn", NULL };
 
        static const char *samba_dsdb_attrs[] = { "backendType", "serverRole", NULL };
        const char *backendType, *serverRole;
@@ -219,6 +221,12 @@ static int samba_dsdb_init(struct ldb_module *module)
                return ldb_oom(ldb);
        }
 
+       ret = ldb_register_samba_handlers(ldb);
+       if (ret != LDB_SUCCESS) {
+               talloc_free(tmp_ctx);
+               return ret;
+       }
+
        samba_dsdb_dn = ldb_dn_new(tmp_ctx, ldb, "@SAMBA_DSDB");
        if (!samba_dsdb_dn) {
                talloc_free(tmp_ctx);
@@ -234,7 +242,7 @@ static int samba_dsdb_init(struct ldb_module *module)
        } while (0)
 
        ret = dsdb_module_search_dn(module, tmp_ctx, &res, samba_dsdb_dn,
-                                   samba_dsdb_attrs, DSDB_FLAG_NEXT_MODULE);
+                                   samba_dsdb_attrs, DSDB_FLAG_NEXT_MODULE, NULL);
        if (ret == LDB_ERR_NO_SUCH_OBJECT) {
                backendType = "ldb";
                serverRole = "domain controller";
@@ -259,6 +267,8 @@ static int samba_dsdb_init(struct ldb_module *module)
                        link_modules = openldap_modules;
                        backend_modules = openldap_backend_modules;
                        extended_dn_module = extended_dn_module_openldap;
+               } else {
+                       return ldb_error(ldb, LDB_ERR_OPERATIONS_ERROR, "invalid backend type");
                }
                ret = ldb_set_opaque(ldb, "readOnlySchema", (void*)1);
                if (ret != LDB_SUCCESS) {
@@ -287,24 +297,12 @@ static int samba_dsdb_init(struct ldb_module *module)
        CHECK_MODULE_LIST;
 
 
-       ret = read_at_rootdse_record(ldb, module, tmp_ctx, &rootdse_msg);
+       ret = read_at_rootdse_record(ldb, module, tmp_ctx, &rootdse_msg, NULL);
        CHECK_LDB_RET(ret);
 
        partition_msg = ldb_msg_new(tmp_ctx);
        partition_msg->dn = ldb_dn_new(partition_msg, ldb, "@" DSDB_OPAQUE_PARTITION_MODULE_MSG_OPAQUE_NAME);
 
-       ret = prepare_modules_line(ldb, tmp_ctx,
-                                  rootdse_msg,
-                                  partition_msg, "defaultNamingContext",
-                                  "pdc_fsmo", backend_modules);
-       CHECK_LDB_RET(ret);
-
-       ret = prepare_modules_line(ldb, tmp_ctx,
-                                  rootdse_msg,
-                                  partition_msg, "configurationNamingContext",
-                                  "naming_fsmo", backend_modules);
-       CHECK_LDB_RET(ret);
-
        ret = prepare_modules_line(ldb, tmp_ctx,
                                   rootdse_msg,
                                   partition_msg, "schemaNamingContext",
@@ -338,18 +336,24 @@ static int samba_dsdb_init(struct ldb_module *module)
        /* The backend (at least until the partitions module
         * reconfigures things) is the next module in the currently
         * loaded chain */
-       backend_module = module->next;
-       ret = ldb_load_modules_list(ldb, reverse_module_list, backend_module, &module_chain);
+       backend_module = ldb_module_next(module);
+       ret = ldb_module_load_list(ldb, reverse_module_list, backend_module, &module_chain);
        CHECK_LDB_RET(ret);
 
        talloc_free(tmp_ctx);
        /* Set this as the 'next' module, so that we effectivly append it to module chain */
-       module->next = module_chain;
+       ldb_module_set_next(module, module_chain);
 
        return ldb_next_init(module);
 }
 
-_PUBLIC_ const struct ldb_module_ops ldb_samba_dsdb_module_ops = {
+static const struct ldb_module_ops ldb_samba_dsdb_module_ops = {
        .name              = "samba_dsdb",
        .init_context      = samba_dsdb_init,
 };
+
+int ldb_samba_dsdb_module_init(const char *version)
+{
+       LDB_MODULE_CHECK_VERSION(version);
+       return ldb_register_module(&ldb_samba_dsdb_module_ops);
+}