From: Andrew Bartlett Date: Tue, 6 Jun 2017 03:21:50 +0000 (+1200) Subject: provision: Move default handler for site=None down into dc_join object creation X-Git-Tag: ldb-1.1.31~99 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db475ed6b4cdf59252a072d4af6fefeb32a50b87;p=thirdparty%2Fsamba.git provision: Move default handler for site=None down into dc_join object creation This makes this code easier to call from a test script Signed-off-by: Andrew Bartlett Reviewed-by: Garming Sam --- diff --git a/python/samba/join.py b/python/samba/join.py index 3e70db08d2a..681275cd72d 100644 --- a/python/samba/join.py +++ b/python/samba/join.py @@ -53,6 +53,9 @@ class dc_join(object): netbios_name=None, targetdir=None, domain=None, machinepass=None, use_ntvfs=False, dns_backend=None, promote_existing=False, clone_only=False): + if site is None: + site = "Default-First-Site-Name" + ctx.clone_only=clone_only ctx.logger = logger diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py index 4bd99ba6ff5..e3a0e4921f2 100644 --- a/python/samba/netcmd/domain.py +++ b/python/samba/netcmd/domain.py @@ -551,9 +551,6 @@ class cmd_domain_dcpromo(Command): creds = credopts.get_credentials(lp) net = Net(creds, lp, server=credopts.ipaddress) - if site is None: - site = "Default-First-Site-Name" - logger = self.get_logger() if verbose: logger.setLevel(logging.DEBUG)