librpc/rpc: map DCERPC_NCA_S_UNSUPPORTED_TYPE to NT_STATUS_RPC_UNSUPPORTED_TYPE

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
(cherry picked from commit 492f6a0eef7e7c64806ac9137c18a76fd116766d)

diff --git a/librpc/rpc/dcerpc_error.c b/librpc/rpc/dcerpc_error.c
index 1c6ca2bbd34a2cbec84f4af50b0d8400ae34d7ce..26c96336615464c49409dbd20a30a62bcbdb6726 100644 (file)
--- a/librpc/rpc/dcerpc_error.c
+++ b/librpc/rpc/dcerpc_error.c
@@ -42,7 +42,7 @@ static const struct dcerpc_fault_table dcerpc_faults[] =
        _FAULT_STR_NO_NT_MAPPING(DCERPC_NCA_S_OUT_ARGS_TOO_BIG),
        _FAULT_STR(DCERPC_NCA_S_SERVER_TOO_BUSY, NT_STATUS_RPC_SERVER_TOO_BUSY),
        _FAULT_STR_NO_NT_MAPPING(DCERPC_NCA_S_FAULT_STRING_TOO_LARGE),
-       _FAULT_STR_NO_NT_MAPPING(DCERPC_NCA_S_UNSUPPORTED_TYPE),
+       _FAULT_STR(DCERPC_NCA_S_UNSUPPORTED_TYPE, NT_STATUS_RPC_UNSUPPORTED_TYPE),
        _FAULT_STR_NO_NT_MAPPING(DCERPC_NCA_S_FAULT_ADDR_ERROR),
        _FAULT_STR(DCERPC_NCA_S_FAULT_FP_DIV_BY_ZERO, NT_STATUS_RPC_FP_DIV_ZERO),
        _FAULT_STR(DCERPC_NCA_S_FAULT_FP_UNDERFLOW, NT_STATUS_RPC_FP_UNDERFLOW),

diff --git a/source4/torture/rpc/iremotewinspool.c b/source4/torture/rpc/iremotewinspool.c
index 3a7ee64827862e822a62cd6407594bc62490793e..d43f4ff36a4c827e561197c4ea1a018d63993494 100644 (file)
--- a/source4/torture/rpc/iremotewinspool.c
+++ b/source4/torture/rpc/iremotewinspool.c
@@ -884,21 +884,21 @@ static bool test_object_uuid(struct torture_context *tctx,
 
        torture_assert(tctx,
                test_object_one_uuid(tctx, NULL,
-                       NT_STATUS_RPC_NOT_RPC_ERROR,
+                       NT_STATUS_RPC_UNSUPPORTED_TYPE,
                        DCERPC_NCA_S_UNSUPPORTED_TYPE),
                "failed to test NULL object uuid");
 
        object_uuid = GUID_zero();
        torture_assert(tctx,
                test_object_one_uuid(tctx, &object_uuid,
-                       NT_STATUS_RPC_NOT_RPC_ERROR,
+                       NT_STATUS_RPC_UNSUPPORTED_TYPE,
                        DCERPC_NCA_S_UNSUPPORTED_TYPE),
                "failed to test zeroed object uuid");
 
        object_uuid = GUID_random();
        torture_assert(tctx,
                test_object_one_uuid(tctx, &object_uuid,
-                       NT_STATUS_RPC_NOT_RPC_ERROR,
+                       NT_STATUS_RPC_UNSUPPORTED_TYPE,
                        DCERPC_NCA_S_UNSUPPORTED_TYPE),
                "failed to test random object uuid");
 
@@ -911,13 +911,13 @@ static bool test_object_uuid(struct torture_context *tctx,
 
        torture_assert(tctx,
                test_object_one_uuid(tctx, &ndr_table_spoolss.syntax_id.uuid,
-                       NT_STATUS_RPC_NOT_RPC_ERROR,
+                       NT_STATUS_RPC_UNSUPPORTED_TYPE,
                        DCERPC_NCA_S_UNSUPPORTED_TYPE),
                "failed to test spoolss interface uuid");
 
        torture_assert(tctx,
                test_object_one_uuid(tctx, &ndr_table_iremotewinspool.syntax_id.uuid,
-                       NT_STATUS_RPC_NOT_RPC_ERROR,
+                       NT_STATUS_RPC_UNSUPPORTED_TYPE,
                        DCERPC_NCA_S_UNSUPPORTED_TYPE),
                "failed to test iremotewinspool interface uuid");