Use the repl_meta_data module by default.

This means that, except when we back onto LDAP, when it will be
replaced with the mapping backend, we will keep this codepath tested.

Andrew Bartlett
(This used to be commit e8fb5da5a18c1c3bd788b1ab3f814ffb847b00fd)

diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index a21cf250cbff8112afc168e50b00a0e721227d9d..5100b7cb7c89ea2e6a4bb9521b52980fd2b5c743 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -391,6 +391,10 @@ static int replmd_add_originating(struct ldb_module *module,
                m->originating_usn              = seq_num;
                m->local_usn                    = seq_num;
                ni++;
+
+               if (ldb_attr_cmp(e->name, ldb_dn_get_rdn_name(msg->dn))) {
+                       rdn_attr = sa;
+               }
        }
 
        /* fix meta data count */

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 5c4ff6877f23e1a17b439b5f4848d2654d92eb6c..b782d948be2e4607968f99bbb2f9f24c90a5eede 100644 (file)
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -693,6 +693,8 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 
        samdb.set_domain_sid(subobj.DOMAINSID);
 
+       samdb.set_ntds_invocationId(subobj.INVOCATIONID);
+
        var load_schema_ok = load_schema(subobj, message, samdb);
        assert(load_schema_ok.is_ok);
 
@@ -1010,9 +1012,9 @@ function provision_guess()
        subobj.DOMAINDN_MOD = "pdc_fsmo,password_hash,instancetype";
        subobj.CONFIGDN_MOD = "naming_fsmo,instancetype";
        subobj.SCHEMADN_MOD = "schema_fsmo,instancetype";
-       subobj.DOMAINDN_MOD2 = ",objectguid";
-       subobj.CONFIGDN_MOD2 = ",objectguid";
-       subobj.SCHEMADN_MOD2 = ",objectguid";
+       subobj.DOMAINDN_MOD2 = ",repl_meta_data";
+       subobj.CONFIGDN_MOD2 = ",repl_meta_data";
+       subobj.SCHEMADN_MOD2 = ",repl_meta_data";
 
        subobj.ACI              = "# no aci for local ldb";