From 4edbc719e5aa63b617f170b51382592dd57aa7b7 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 28 Nov 2011 20:03:11 +0100 Subject: s4:python/samba/join.py: add optional 'machinepass' parameter to join_*() metze --- source4/scripting/python/samba/join.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'source4') 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 -- cgit