From 5356fa0a5ac11525603d33a20f9eb63634f65f0b Mon Sep 17 00:00:00 2001 From: Bob Campbell Date: Fri, 13 Jan 2017 12:21:42 +1300 Subject: [PATCH] samba-tool/domain: change incorrect NT_STATUS to WERR Since the called functions here return a WERR rather than an NTSTATUS, the checked for errors were incorrect. Signed-off-by: Bob Campbell Reviewed-by: Andrew Bartlett Reviewed-by: Garming Sam --- python/samba/netcmd/domain.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py index b4081e63911..ced20d78c39 100644 --- a/python/samba/netcmd/domain.py +++ b/python/samba/netcmd/domain.py @@ -1614,6 +1614,7 @@ class DomainTrustCommand(Command): WERR_OK = 0x00000000 WERR_INVALID_FUNCTION = 0x00000001 WERR_NERR_ACFNOTLOADED = 0x000008B3 + WERR_RPC_S_PROCNUM_OUT_OF_RANGE = 0x000006D1 NT_STATUS_NOT_FOUND = 0xC0000225 NT_STATUS_OBJECT_NAME_NOT_FOUND = 0xC0000034 @@ -2009,7 +2010,7 @@ class cmd_domain_trust_list(DomainTrustCommand): netlogon.NETR_TRUST_FLAG_OUTBOUND | netlogon.NETR_TRUST_FLAG_INBOUND) except RuntimeError as error: - if self.check_runtime_error(error, self.NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE): + if self.check_runtime_error(error, self.WERR_RPC_S_PROCNUM_OUT_OF_RANGE): # TODO: we could implement a fallback to lsa.EnumTrustDom() raise CommandError("LOCAL_DC[%s]: netr_DsrEnumerateDomainTrusts not supported." % ( self.local_server)) @@ -3301,7 +3302,7 @@ class cmd_domain_trust_namespaces(DomainTrustCommand): own_forest_info = local_netlogon.netr_DsRGetForestTrustInformation(local_netlogon_info.dc_unc, None, 0) except RuntimeError as error: - if self.check_runtime_error(error, self.NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE): + if self.check_runtime_error(error, self.WERR_RPC_S_PROCNUM_OUT_OF_RANGE): raise CommandError("LOCAL_DC[%s]: netr_DsRGetForestTrustInformation() not supported." % ( self.local_server)) -- 2.47.2