1
0
mirror of https://github.com/altlinux/gpupdate.git synced 2025-03-21 18:50:38 +03:00

Merge pull request #112 from altlinux/avoid_dc_search

Avoid DC search on DC specification (either as CLI or config option)
This commit is contained in:
NIR 2020-09-07 17:41:16 +04:00 committed by GitHub
commit e7967e5cc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -43,7 +43,7 @@ class smbcreds (smbopts):
smbopts.__init__(self, 'GPO Applier')
self.credopts = options.CredentialsOptions(self.parser)
self.creds = self.credopts.get_credentials(self.lp, fallback_machine=True)
self.selected_dc = self.set_dc(dc_fqdn)
self.set_dc(dc_fqdn)
def get_dc(self):
return self.selected_dc
@ -55,9 +55,7 @@ class smbcreds (smbopts):
self.selected_dc = None
try:
samba_dc = get_dc_hostname(self.creds, self.lp)
if samba_dc != dc_fqdn and dc_fqdn is not None:
if dc_fqdn is not None:
logdata = dict()
logdata['dc'] = samba_dc
logdata['user_dc'] = dc_fqdn
@ -65,15 +63,13 @@ class smbcreds (smbopts):
self.selected_dc = dc_fqdn
else:
self.selected_dc = samba_dc
self.selected_dc = get_dc_hostname(self.creds, self.lp)
except Exception as exc:
logdata = dict()
logdata['msg'] = str(exc)
log('E10', logdata)
raise exc
return self.selected_dc
def get_domain(self):
'''
Get current Active Directory domain name