samba-tool/domain: change incorrect NT_STATUS to WERR
authorBob Campbell <bobcampbell@catalyst.net.nz>
Thu, 12 Jan 2017 23:21:42 +0000 (12:21 +1300)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 14 Feb 2017 08:46:23 +0000 (09:46 +0100)
Since the called functions here return a WERR rather than an NTSTATUS,
the checked for errors were incorrect.

Signed-off-by: Bob Campbell <bobcampbell@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
python/samba/netcmd/domain.py

index b4081e63911ff81cb37acaea46a6557fb256e284..ced20d78c39bb662c404532e02c721902868edb8 100644 (file)
@@ -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))