summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-11-05 19:09:45 +1100
committerAndrew Tridgell <tridge@samba.org>2010-11-05 13:24:32 +0000
commit11ae1046a00d858551692d9bd05935d16734a2ef (patch)
tree5f1942e4c0ad70f3af697d1507030c60835a4ab4
parent351312d8b870698a44dc1a9766ce7aeec7028602 (diff)
downloadsamba-11ae1046a00d858551692d9bd05935d16734a2ef.tar.gz
samba-11ae1046a00d858551692d9bd05935d16734a2ef.tar.bz2
samba-11ae1046a00d858551692d9bd05935d16734a2ef.zip
s4-join: fixed secure_channel_type
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org> Autobuild-User: Andrew Tridgell <tridge@samba.org> Autobuild-Date: Fri Nov 5 13:24:32 UTC 2010 on sn-devel-104
-rw-r--r--source4/scripting/python/samba/join.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/source4/scripting/python/samba/join.py b/source4/scripting/python/samba/join.py
index 4aaef316df..d57eb58fb5 100644
--- a/source4/scripting/python/samba/join.py
+++ b/source4/scripting/python/samba/join.py
@@ -432,7 +432,7 @@ class dc_join:
netbiosname=ctx.myname,
domainsid=security.dom_sid(ctx.domsid),
machinepass=ctx.acct_pass,
- secure_channel_type=misc.SEC_CHAN_RODC,
+ secure_channel_type=ctx.secure_channel_type,
key_version_number=ctx.key_version_number)
def do_join(ctx):
@@ -474,6 +474,7 @@ def join_RODC(server=None, creds=None, lp=None, site=None, netbios_name=None,
"RestrictedKrbHost/%s" % ctx.dnshostname ])
ctx.connection_dn = "CN=RODC Connection (FRS),%s" % ctx.ntds_dn
+ ctx.secure_channel_type = misc.SEC_CHAN_RODC
ctx.RODC = True
ctx.do_join()
print "Joined domain %s (SID %s) as an RODC" % (ctx.domain_name, ctx.domsid)
@@ -487,6 +488,7 @@ def join_DC(server=None, creds=None, lp=None, site=None, netbios_name=None,
ctx.userAccountControl = samba.dsdb.UF_SERVER_TRUST_ACCOUNT | samba.dsdb.UF_TRUSTED_FOR_DELEGATION
ctx.SPNs.append('E3514235-4B06-11D1-AB04-00C04FC2DCD2/$NTDSGUID/%s' % ctx.dnsdomain)
+ ctx.secure_channel_type = misc.SEC_CHAN_BDC
ctx.do_join()
print "Joined domain %s (SID %s) as an DC" % (ctx.domain_name, ctx.domsid)