summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-01-24 14:28:25 +1100
committerAndrew Bartlett <abartlet@samba.org>2008-01-24 14:28:25 +1100
commita2d7a3b627842b70cfe2aa8318ce5b7353989261 (patch)
tree4886150b57b1104f37edeef37aea7c510320a125
parent1557e7b930b95fa5309390c46f72e14628447703 (diff)
downloadsamba-a2d7a3b627842b70cfe2aa8318ce5b7353989261.tar.gz
samba-a2d7a3b627842b70cfe2aa8318ce5b7353989261.tar.bz2
samba-a2d7a3b627842b70cfe2aa8318ce5b7353989261.zip
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)
-rw-r--r--source4/dsdb/samdb/ldb_modules/repl_meta_data.c4
-rw-r--r--source4/scripting/libjs/provision.js8
2 files changed, 9 insertions, 3 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index a21cf250cb..5100b7cb7c 100644
--- 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 5c4ff6877f..b782d948be 100644
--- 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";