sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-06 08:59:08 +03:00
Code Activity

s4:provision Make setting the domain SID in the self join optional

Browse Source
This commit is contained in:
Andrew Bartlett
2009-11-26 14:57:39 +11:00
committed by Andrew Tridgell
parent 4a52ee3cd5
commit 09338e60bc
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -572,7 +572,7 @@ def setup_samdb_partitions(samdb_path, setup_path, message, lp, session_info,
def secretsdb_self_join(secretsdb, domain,
netbiosname, domainsid, machinepass,
netbiosname, machinepass, domainsid=None,
realm=None, dnsdomain=None,
keytab_path=None,
key_version_number=1,
@ -607,7 +607,8 @@ def secretsdb_self_join(secretsdb, domain,
msg["secret"] = [machinepass]
msg["samAccountName"] = ["%s$" % netbiosname]
msg["secureChannelType"] = [str(secure_channel_type)]
msg["objectSid"] = [ndr_pack(domainsid)]
if domainsid is not None:
msg["objectSid"] = [ndr_pack(domainsid)]
res = secretsdb.search(base="cn=Primary Domains",
attrs=attrs,
@ -1267,7 +1268,7 @@ def provision(setup_dir, message, session_info,
# Only make a zone file on the first DC, it should be replicated with DNS replication
if serverrole == "domain controller":
secretsdb_self_join(secrets_ldb, domain=domain,
secretsdb_self_join(secrets_ldb, domain=names.domain,
realm=names.realm,
dnsdomain=names.dnsdomain,
netbiosname=names.netbiosname,