summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2009-10-06 14:12:04 +1100
committerAndrew Bartlett <abartlet@samba.org>2009-10-12 16:50:49 +1100
commit0bfc3023a1f2810f096ba282bc64ccb09d3cfe3e (patch)
treed207c74458e474f5f2d69d9267a3826f22338f64
parent3ecfd06d64cf91098ec33c33a003d7f5b5c1b71d (diff)
downloadsamba-0bfc3023a1f2810f096ba282bc64ccb09d3cfe3e.tar.gz
samba-0bfc3023a1f2810f096ba282bc64ccb09d3cfe3e.tar.bz2
samba-0bfc3023a1f2810f096ba282bc64ccb09d3cfe3e.zip
s4:provision Clarify that we set, rather than modify, objectGUID values
-rw-r--r--source4/scripting/python/samba/provision.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 869cd75465..b6ae747c70 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -883,9 +883,9 @@ def setup_self_join(samdb, names,
"""Join a host to its own domain."""
assert isinstance(invocationid, str)
if ntdsguid is not None:
- ntdsguid_mod = "objectGUID: %s\n"%ntdsguid
+ ntdsguid_line = "objectGUID: %s\n"%ntdsguid
else:
- ntdsguid_mod = ""
+ ntdsguid_line = ""
setup_add_ldif(samdb, setup_path("provision_self_join.ldif"), {
"CONFIGDN": names.configdn,
"SCHEMADN": names.schemadn,
@@ -901,7 +901,7 @@ def setup_self_join(samdb, names,
"DOMAIN": names.domain,
"DNSDOMAIN": names.dnsdomain,
"SAMBA_VERSION_STRING": version,
- "NTDSGUID": ntdsguid_mod,
+ "NTDSGUID": ntdsguid_line,
"DOMAIN_CONTROLLER_FUNCTIONALITY": str(domainControllerFunctionality)})
setup_add_ldif(samdb, setup_path("provision_group_policy.ldif"), {
@@ -1019,13 +1019,13 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
admin_session_info = admin_session(lp, str(domainsid))
samdb.set_session_info(admin_session_info)
if domainguid is not None:
- domainguid_mod = "objectGUID: %s\n-" % domainguid
+ domainguid_line = "objectGUID: %s\n-" % domainguid
else:
- domainguid_mod = ""
+ domainguid_line = ""
setup_add_ldif(samdb, setup_path("provision_basedn.ldif"), {
"DOMAINDN": names.domaindn,
"DOMAIN_OC": domain_oc,
- "DOMAINGUID": domainguid_mod
+ "DOMAINGUID": domainguid_line
})