summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-11-28 20:03:11 +0100
committerStefan Metzmacher <metze@samba.org>2011-11-29 09:21:25 +0100
commit4edbc719e5aa63b617f170b51382592dd57aa7b7 (patch)
treee7316a9af99af3d49a125b99c460515203db7212 /source4
parent948f091a22a5e2bd348d2840e0fdff1d9c9baca7 (diff)
downloadsamba-4edbc719e5aa63b617f170b51382592dd57aa7b7.tar.gz
samba-4edbc719e5aa63b617f170b51382592dd57aa7b7.tar.bz2
samba-4edbc719e5aa63b617f170b51382592dd57aa7b7.zip
s4:python/samba/join.py: add optional 'machinepass' parameter to join_*()
metze
Diffstat (limited to 'source4')
-rw-r--r--source4/scripting/python/samba/join.py18
1 files changed, 12 insertions, 6 deletions
diff --git a/source4/scripting/python/samba/join.py b/source4/scripting/python/samba/join.py
index bd91e6269e..5f546a100d 100644
--- a/source4/scripting/python/samba/join.py
+++ b/source4/scripting/python/samba/join.py
@@ -860,10 +860,12 @@ class dc_join(object):
def join_RODC(server=None, creds=None, lp=None, site=None, netbios_name=None,
- targetdir=None, domain=None, domain_critical_only=False):
+ targetdir=None, domain=None, domain_critical_only=False,
+ machinepass=None):
"""join as a RODC"""
- ctx = dc_join(server, creds, lp, site, netbios_name, targetdir, domain)
+ ctx = dc_join(server, creds, lp, site, netbios_name, targetdir, domain,
+ machinepass)
lp.set("workgroup", ctx.domain_name)
print("workgroup is %s" % ctx.domain_name)
@@ -912,9 +914,11 @@ def join_RODC(server=None, creds=None, lp=None, site=None, netbios_name=None,
def join_DC(server=None, creds=None, lp=None, site=None, netbios_name=None,
- targetdir=None, domain=None, domain_critical_only=False):
+ targetdir=None, domain=None, domain_critical_only=False,
+ machinepass=None):
"""join as a DC"""
- ctx = dc_join(server, creds, lp, site, netbios_name, targetdir, domain)
+ ctx = dc_join(server, creds, lp, site, netbios_name, targetdir, domain,
+ machinepass)
lp.set("workgroup", ctx.domain_name)
print("workgroup is %s" % ctx.domain_name)
@@ -940,9 +944,11 @@ def join_DC(server=None, creds=None, lp=None, site=None, netbios_name=None,
print "Joined domain %s (SID %s) as a DC" % (ctx.domain_name, ctx.domsid)
def join_subdomain(server=None, creds=None, lp=None, site=None, netbios_name=None,
- targetdir=None, parent_domain=None, dnsdomain=None, netbios_domain=None):
+ targetdir=None, parent_domain=None, dnsdomain=None, netbios_domain=None,
+ machinepass=None):
"""join as a DC"""
- ctx = dc_join(server, creds, lp, site, netbios_name, targetdir, parent_domain)
+ ctx = dc_join(server, creds, lp, site, netbios_name, targetdir, parent_domain,
+ machinepass)
ctx.subdomain = True
ctx.parent_domain_name = ctx.domain_name
ctx.domain_name = netbios_domain