[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-539-ge8fb5da

[Andrew Bartlett]

The branch, v4-0-test has been updated
       via  e8fb5da5a18c1c3bd788b1ab3f814ffb847b00fd (commit)
       via  e9bb130d63e86fafc4cbf379e2e237354b88bcf8 (commit)
      from  f65e5c164476b80468aa19452b108db17c642f8b (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit e8fb5da5a18c1c3bd788b1ab3f814ffb847b00fd
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Jan 24 14:28:25 2008 +1100

    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

commit e9bb130d63e86fafc4cbf379e2e237354b88bcf8
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Jan 24 11:33:37 2008 +1100

    Kill another sub that the modules will handle for us.

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

Summary of changes:
 source/dsdb/samdb/ldb_modules/repl_meta_data.c |    4 ++++
 source/scripting/libjs/provision.js            |   11 +++++------
 source/setup/provision_basedn.ldif             |    1 -
 source/setup/provision_basedn_modify.ldif      |    3 ---
 4 files changed, 9 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/dsdb/samdb/ldb_modules/repl_meta_data.c b/source/dsdb/samdb/ldb_modules/repl_meta_data.c
index a21cf25..5100b7c 100644
--- a/source/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source/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/source/scripting/libjs/provision.js b/source/scripting/libjs/provision.js
index 175a178..b782d94 100644
--- a/source/scripting/libjs/provision.js
+++ b/source/scripting/libjs/provision.js
@@ -484,9 +484,6 @@ function provision_fix_subobj(subobj, paths)
 	subobj.ADMINPASS_B64   = ldb.encode(subobj.ADMINPASS);
 	subobj.DNSPASS_B64     = ldb.encode(subobj.DNSPASS);
 
-	var rdns = split(",", subobj.DOMAINDN);
-	subobj.RDN_DC = substr(rdns[0], strlen("DC="));
-
 	subobj.SAM_LDB		= "tdb://" + paths.samdb;
 	subobj.SECRETS_KEYTAB	= paths.keytab;
 	subobj.DNS_KEYTAB	= paths.dns_keytab;
@@ -696,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);
 
@@ -1013,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";
 
diff --git a/source/setup/provision_basedn.ldif b/source/setup/provision_basedn.ldif
index 3c7537f..11eb059 100644
--- a/source/setup/provision_basedn.ldif
+++ b/source/setup/provision_basedn.ldif
@@ -6,5 +6,4 @@ objectClass: top
 objectClass: domain
 objectClass: domainDNS
 ${ACI}
-dc: ${RDN_DC}
 
diff --git a/source/setup/provision_basedn_modify.ldif b/source/setup/provision_basedn_modify.ldif
index fa99059..dadfda7 100644
--- a/source/setup/provision_basedn_modify.ldif
+++ b/source/setup/provision_basedn_modify.ldif
@@ -4,9 +4,6 @@
 dn: ${DOMAINDN}
 changetype: modify
 -
-replace: dc
-dc: ${RDN_DC}
--
 replace: forceLogoff
 forceLogoff: 9223372036854775808
 -


-- 
Samba Shared Repository