The branch, v4-0-test has been updated
via be5eb2da241452ccc0526f4f115aa44c0793c351 (commit)
via ae2ea1bd0cd2b326b09b372428969f2cf52ce519 (commit)
from e8fb5da5a18c1c3bd788b1ab3f814ffb847b00fd (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit be5eb2da241452ccc0526f4f115aa44c0793c351
Author: Andrew Bartlett <[EMAIL PROTECTED]>
Date: Thu Jan 24 16:25:35 2008 +1100
Ensure we set subobj.BACKEND_MOD for the 'partitions only' case.
Andrew Bartlett
commit ae2ea1bd0cd2b326b09b372428969f2cf52ce519
Author: Andrew Bartlett <[EMAIL PROTECTED]>
Date: Thu Jan 24 16:17:45 2008 +1100
Make the repl_meta_data module the default for domain controllers.
Andrew Bartlett
-----------------------------------------------------------------------
Summary of changes:
source/scripting/libjs/provision.js | 33 ++++++++++++++++++++++++++----
source/setup/provision | 8 +++---
source/setup/provision_partitions.ldif | 6 ++--
source/torture/libnet/libnet_BecomeDC.c | 4 ---
4 files changed, 35 insertions(+), 16 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/scripting/libjs/provision.js
b/source/scripting/libjs/provision.js
index b782d94..e714980 100644
--- a/source/scripting/libjs/provision.js
+++ b/source/scripting/libjs/provision.js
@@ -524,6 +524,10 @@ function provision_become_dc(subobj, message, erase,
paths, session_info)
var ok = provision_fix_subobj(subobj, paths);
assert(ok);
+ if (subobj.BACKEND_MOD == undefined) {
+ subobj.BACKEND_MOD = "repl_meta_data";
+ }
+
info.subobj = subobj;
info.message = message;
info.session_info = session_info;
@@ -610,10 +614,21 @@ function provision(subobj, message, blank, paths,
session_info, credentials, lda
var lp = loadparm_init();
var sys = sys_init();
var info = new Object();
+ random_init(local);
var ok = provision_fix_subobj(subobj, paths);
assert(ok);
+ if (strlower(subobj.SERVERROLE) == strlower("domain controller")) {
+ if (subobj.BACKEND_MOD == undefined) {
+ subobj.BACKEND_MOD = "repl_meta_data";
+ }
+ } else {
+ if (subobj.BACKEND_MOD == undefined) {
+ subobj.BACKEND_MOD = "objectguid";
+ }
+ }
+
if (subobj.DOMAINGUID != undefined) {
subobj.DOMAINGUID_MOD = sprintf("replace:
objectGUID\nobjectGUID: %s\n-", subobj.DOMAINGUID);
} else {
@@ -693,7 +708,19 @@ function provision(subobj, message, blank, paths,
session_info, credentials, lda
samdb.set_domain_sid(subobj.DOMAINSID);
- samdb.set_ntds_invocationId(subobj.INVOCATIONID);
+ if (strlower(subobj.SERVERROLE) == strlower("domain controller")) {
+ if (subobj.INVOCATIONID == undefined) {
+ subobj.INVOCATIONID = randguid();
+ }
+ samdb.set_ntds_invocationId(subobj.INVOCATIONID);
+ if (subobj.BACKEND_MOD == undefined) {
+ subobj.BACKEND_MOD = "repl_meta_data";
+ }
+ } else {
+ if (subobj.BACKEND_MOD == undefined) {
+ subobj.BACKEND_MOD = "objectguid";
+ }
+ }
var load_schema_ok = load_schema(subobj, message, samdb);
assert(load_schema_ok.is_ok);
@@ -960,7 +987,6 @@ function provision_guess()
subobj.VERSION = version();
subobj.HOSTIP = hostip();
subobj.DOMAINSID = randsid();
- subobj.INVOCATIONID = randguid();
subobj.POLICYGUID = randguid();
subobj.KRBTGTPASS = randpass(12);
subobj.MACHINEPASS = randpass(12);
@@ -1012,9 +1038,6 @@ 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 = ",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 b/source/setup/provision
index 8b24c51..9e135cd 100755
--- a/source/setup/provision
+++ b/source/setup/provision
@@ -143,12 +143,10 @@ if (ldapbackend) {
subobj.LDAPMODULE = "normalise,entryuuid";
subobj.TDB_MODULES_LIST = "";
}
+ subobj.BACKEND_MOD = subobj.LDAPMODULE + ",paged_searches";
subobj.DOMAINDN_LDB = subobj.LDAPBACKEND;
- subobj.DOMAINDN_MOD2 = "," + subobj.LDAPMODULE + ",paged_searches";
subobj.CONFIGDN_LDB = subobj.LDAPBACKEND;
- subobj.CONFIGDN_MOD2 = "," + subobj.LDAPMODULE + ",paged_searches";
subobj.SCHEMADN_LDB = subobj.LDAPBACKEND;
- subobj.SCHEMADN_MOD2 = "," + subobj.LDAPMODULE + ",paged_searches";
message("LDAP module: %s on backend: %s\n", subobj.LDAPMODULE,
subobj.LDAPBACKEND);
}
@@ -175,7 +173,9 @@ if (partitions_only) {
message("--host-guid='%s' \\\n", subobj.HOSTGUID);
}
message("--policy-guid='%s' --host-name='%s' --host-ip='%s' \\\n",
subobj.POLICYGUID, subobj.HOSTNAME, subobj.HOSTIP);
- message("--invocationid='%s' \\\n", subobj.INVOCATIONID);
+ if (subobj.INVOCATIONID != undefined) {
+ message("--invocationid='%s' \\\n", subobj.INVOCATIONID);
+ }
message("--adminpass='%s' --krbtgtpass='%s' \\\n", subobj.ADMINPASS,
subobj.KRBTGTPASS);
message("--machinepass='%s' --dnspass='%s' \\\n", subobj.MACHINEPASS,
subobj.DNSPASS);
message("--root='%s' --nobody='%s' --nogroup='%s' \\\n", subobj.ROOT,
subobj.NOBODY, subobj.NOGROUP);
diff --git a/source/setup/provision_partitions.ldif
b/source/setup/provision_partitions.ldif
index fb8bc7f..93fea6b 100644
--- a/source/setup/provision_partitions.ldif
+++ b/source/setup/provision_partitions.ldif
@@ -5,9 +5,9 @@ partition: ${DOMAINDN}:${DOMAINDN_LDB}
replicateEntries: @ATTRIBUTES
replicateEntries: @INDEXLIST
replicateEntries: @OPTIONS
-modules:${SCHEMADN}:${SCHEMADN_MOD}${SCHEMADN_MOD2}
-modules:${CONFIGDN}:${CONFIGDN_MOD}${CONFIGDN_MOD2}
-modules:${DOMAINDN}:${DOMAINDN_MOD}${DOMAINDN_MOD2}
+modules:${SCHEMADN}:${SCHEMADN_MOD},${BACKEND_MOD}
+modules:${CONFIGDN}:${CONFIGDN_MOD},${BACKEND_MOD}
+modules:${DOMAINDN}:${DOMAINDN_MOD},${BACKEND_MOD}
dn: @MODULES
@LIST: ${MODULES_LIST}${TDB_MODULES_LIST},${MODULES_LIST2}
diff --git a/source/torture/libnet/libnet_BecomeDC.c
b/source/torture/libnet/libnet_BecomeDC.c
index 932498a..d964535 100644
--- a/source/torture/libnet/libnet_BecomeDC.c
+++ b/source/torture/libnet/libnet_BecomeDC.c
@@ -201,10 +201,6 @@ static NTSTATUS test_become_dc_prepare_db(void
*private_data,
"subobj.DOMAIN = \"%s\";\n"
"subobj.DEFAULTSITE = \"%s\";\n"
"\n"
- "subobj.DOMAINDN_MOD2 = \",repl_meta_data\";\n"
- "subobj.CONFIGDN_MOD2 = \",repl_meta_data\";\n"
- "subobj.SCHEMADN_MOD2 = \",repl_meta_data\";\n"
- "\n"
"subobj.KRBTGTPASS = \"_NOT_USED_\";\n"
"subobj.MACHINEPASS = \"%s\";\n"
"subobj.ADMINPASS = \"_NOT_USED_\";\n"
--
Samba Shared Repository
