sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-04 17:47:26 +03:00
Code

s4:provision Clarify that we set, rather than modify, objectGUID values

Browse Source
This commit is contained in:
Andrew Bartlett 2009-10-06 14:12:04 +11:00
parent 3ecfd06d64
commit 0bfc3023a1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source4/scripting/python/samba/provision.py
View File

@ -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
})