diff options
author | Joseph Sutton <josephsutton@catalyst.net.nz> | 2023-02-13 14:53:19 +1300 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2023-05-18 01:03:37 +0000 |
commit | 56d98e974c39e640ef2aa3da1d3d2ea9980c677a (patch) | |
tree | e44a5bd72a06fdc6d1bf8385b4b2bdae3a93baf3 /python | |
parent | e03e738dfc96b3c8ce54e2d280143965713f4778 (diff) | |
download | samba-56d98e974c39e640ef2aa3da1d3d2ea9980c677a.tar.gz |
samba-tool domain: Remove unused variables
Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'python')
-rw-r--r-- | python/samba/netcmd/domain/dcpromo.py | 1 | ||||
-rw-r--r-- | python/samba/netcmd/domain/demote.py | 6 | ||||
-rw-r--r-- | python/samba/netcmd/domain/provision.py | 2 | ||||
-rw-r--r-- | python/samba/netcmd/domain/trust.py | 48 |
4 files changed, 24 insertions, 33 deletions
diff --git a/python/samba/netcmd/domain/dcpromo.py b/python/samba/netcmd/domain/dcpromo.py index ba6e89cf03b..bf78b744755 100644 --- a/python/samba/netcmd/domain/dcpromo.py +++ b/python/samba/netcmd/domain/dcpromo.py @@ -61,7 +61,6 @@ class cmd_domain_dcpromo(Command): backend_store=None, backend_store_size=None): lp = sambaopts.get_loadparm() creds = credopts.get_credentials(lp) - net = Net(creds, lp, server=credopts.ipaddress) logger = self.get_logger(verbose=verbose, quiet=quiet) diff --git a/python/samba/netcmd/domain/demote.py b/python/samba/netcmd/domain/demote.py index f3868a20a49..217d90a4b91 100644 --- a/python/samba/netcmd/domain/demote.py +++ b/python/samba/netcmd/domain/demote.py @@ -68,7 +68,6 @@ class cmd_domain_demote(Command): verbose=False, quiet=False): lp = sambaopts.get_loadparm() creds = credopts.get_credentials(lp) - net = Net(creds, lp, server=credopts.ipaddress) logger = self.get_logger(verbose=verbose, quiet=quiet) @@ -193,8 +192,6 @@ class cmd_domain_demote(Command): raise CommandError("Unable to find object with samaccountName = %s$" " in the remote dc" % netbios_name.upper()) - olduac = uac - uac &= ~(UF_SERVER_TRUST_ACCOUNT | UF_TRUSTED_FOR_DELEGATION | UF_PARTIAL_SECRETS_ACCOUNT) @@ -218,7 +215,6 @@ class cmd_domain_demote(Command): raise CommandError("Error while changing account control", e) - parent = msg.dn.parent() dc_name = res[0].dn.get_rdn_value() rdn = "CN=%s" % dc_name @@ -329,7 +325,7 @@ class cmd_domain_demote(Command): try: remote_samdb.delete(ldb.Dn(remote_samdb, "%s,%s" % (s, str(newdn)))) - except ldb.LdbError as l: + except ldb.LdbError: pass # get dns host name for target server to demote, remove dns references diff --git a/python/samba/netcmd/domain/provision.py b/python/samba/netcmd/domain/provision.py index c90eb36a077..bd9cb92b385 100644 --- a/python/samba/netcmd/domain/provision.py +++ b/python/samba/netcmd/domain/provision.py @@ -261,7 +261,7 @@ class cmd_domain_provision(Command): try: dom_for_fun_level = functional_level.string_to_level(function_level) - except KeyError as e: + except KeyError: raise CommandError(f"'{function_level}' is not a valid domain level") if adprep_level is None: diff --git a/python/samba/netcmd/domain/trust.py b/python/samba/netcmd/domain/trust.py index a9fb4ef6604..4a7470869eb 100644 --- a/python/samba/netcmd/domain/trust.py +++ b/python/samba/netcmd/domain/trust.py @@ -495,7 +495,7 @@ class cmd_domain_trust_show(DomainTrustCommand): def run(self, domain, sambaopts=None, versionopts=None, localdcopts=None): - local_server = self.setup_local_server(sambaopts, localdcopts) + self.setup_local_server(sambaopts, localdcopts) try: local_lsa = self.new_local_lsa_connection() except RuntimeError as error: @@ -631,7 +631,7 @@ class cmd_domain_trust_modify(DomainTrustCommand): if num_modifications == 0: raise CommandError("modification arguments are required, try --help") - local_server = self.setup_local_server(sambaopts, localdcopts) + self.setup_local_server(sambaopts, localdcopts) try: local_lsa = self.new_local_lsa_connection() except RuntimeError as error: @@ -933,10 +933,9 @@ class cmd_domain_trust_create(DomainTrustCommand): try: lsaString.string = local_trust_info.domain_name.string - local_old_netbios = \ - local_lsa.QueryTrustedDomainInfoByName(local_policy, - lsaString, - lsa.LSA_TRUSTED_DOMAIN_INFO_FULL_INFO) + local_lsa.QueryTrustedDomainInfoByName(local_policy, + lsaString, + lsa.LSA_TRUSTED_DOMAIN_INFO_FULL_INFO) raise CommandError("TrustedDomain %s already exist'" % lsaString.string) except NTSTATUSError as error: if not self.check_runtime_error(error, ntstatus.NT_STATUS_OBJECT_NAME_NOT_FOUND): @@ -946,10 +945,9 @@ class cmd_domain_trust_create(DomainTrustCommand): try: lsaString.string = local_trust_info.netbios_name.string - local_old_dns = \ - local_lsa.QueryTrustedDomainInfoByName(local_policy, - lsaString, - lsa.LSA_TRUSTED_DOMAIN_INFO_FULL_INFO) + local_lsa.QueryTrustedDomainInfoByName(local_policy, + lsaString, + lsa.LSA_TRUSTED_DOMAIN_INFO_FULL_INFO) raise CommandError("TrustedDomain %s already exist'" % lsaString.string) except NTSTATUSError as error: if not self.check_runtime_error(error, ntstatus.NT_STATUS_OBJECT_NAME_NOT_FOUND): @@ -960,10 +958,9 @@ class cmd_domain_trust_create(DomainTrustCommand): if remote_trust_info: try: lsaString.string = remote_trust_info.domain_name.string - remote_old_netbios = \ - remote_lsa.QueryTrustedDomainInfoByName(remote_policy, - lsaString, - lsa.LSA_TRUSTED_DOMAIN_INFO_FULL_INFO) + remote_lsa.QueryTrustedDomainInfoByName(remote_policy, + lsaString, + lsa.LSA_TRUSTED_DOMAIN_INFO_FULL_INFO) raise CommandError("TrustedDomain %s already exist'" % lsaString.string) except NTSTATUSError as error: if not self.check_runtime_error(error, ntstatus.NT_STATUS_OBJECT_NAME_NOT_FOUND): @@ -973,10 +970,9 @@ class cmd_domain_trust_create(DomainTrustCommand): try: lsaString.string = remote_trust_info.netbios_name.string - remote_old_dns = \ - remote_lsa.QueryTrustedDomainInfoByName(remote_policy, - lsaString, - lsa.LSA_TRUSTED_DOMAIN_INFO_FULL_INFO) + remote_lsa.QueryTrustedDomainInfoByName(remote_policy, + lsaString, + lsa.LSA_TRUSTED_DOMAIN_INFO_FULL_INFO) raise CommandError("TrustedDomain %s already exist'" % lsaString.string) except NTSTATUSError as error: if not self.check_runtime_error(error, ntstatus.NT_STATUS_OBJECT_NAME_NOT_FOUND): @@ -1211,13 +1207,13 @@ class cmd_domain_trust_create(DomainTrustCommand): if remote_tdo_handle is not None: try: remote_lsa.Close(remote_tdo_handle) - except RuntimeError as error: + except RuntimeError: pass remote_tdo_handle = None if local_tdo_handle is not None: try: local_lsa.Close(local_tdo_handle) - except RuntimeError as error: + except RuntimeError: pass local_tdo_handle = None @@ -1261,7 +1257,7 @@ class cmd_domain_trust_delete(DomainTrustCommand): remote_policy_access |= lsa.LSA_POLICY_TRUST_ADMIN remote_policy_access |= lsa.LSA_POLICY_CREATE_SECRET - local_server = self.setup_local_server(sambaopts, localdcopts) + self.setup_local_server(sambaopts, localdcopts) try: local_lsa = self.new_local_lsa_connection() except RuntimeError as error: @@ -1294,7 +1290,7 @@ class cmd_domain_trust_delete(DomainTrustCommand): if remote_policy_access is not None: try: - remote_server = self.setup_remote_server(credopts, domain) + self.setup_remote_server(credopts, domain) except RuntimeError as error: raise self.RemoteRuntimeError(self, error, "failed to locate remote server") @@ -1815,14 +1811,14 @@ class cmd_domain_trust_namespaces(DomainTrustCommand): for s in enable_sid_str: try: sid = security.dom_sid(s) - except (ValueError, TypeError) as error: + except (ValueError, TypeError): raise CommandError("value[%s] specified for --enable-sid is not a valid SID" % s) enable_sid.append(sid) disable_sid = [] for s in disable_sid_str: try: sid = security.dom_sid(s) - except (ValueError, TypeError) as error: + except (ValueError, TypeError): raise CommandError("value[%s] specified for --disable-sid is not a valid SID" % s) disable_sid.append(sid) if len(enable_sid) > 0: @@ -1937,7 +1933,7 @@ class cmd_domain_trust_namespaces(DomainTrustCommand): update_spn_vals.extend(stored_spn_vals) for upn in add_upn: - for i, v in enumerate(update_upn_vals): + for v in update_upn_vals: if str(v).lower() == upn.lower(): raise CommandError("Entry already present for " "value[%s] specified for " @@ -1959,7 +1955,7 @@ class cmd_domain_trust_namespaces(DomainTrustCommand): replace_upn = True for spn in add_spn: - for i, v in enumerate(update_spn_vals): + for v in update_spn_vals: if str(v).lower() == spn.lower(): raise CommandError("Entry already present for " "value[%s] specified for " |