diff options
author | Stefan Metzmacher <metze@samba.org> | 2014-03-19 22:17:11 +0100 |
---|---|---|
committer | Günther Deschner <gd@samba.org> | 2015-07-03 02:00:28 +0200 |
commit | 1eef70872930fa4f9d3dedd23476b34cae638428 (patch) | |
tree | 4ece41de90ebac8cfe96b65729020d5a2569b50d /librpc/rpc | |
parent | cb8c156671530296b746d8b71fd62e677fa88cd0 (diff) | |
download | samba-1eef70872930fa4f9d3dedd23476b34cae638428.tar.gz |
librpc/rpc: add faultcode to nt_status mappings
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
Diffstat (limited to 'librpc/rpc')
-rw-r--r-- | librpc/rpc/dcerpc_error.c | 143 |
1 files changed, 75 insertions, 68 deletions
diff --git a/librpc/rpc/dcerpc_error.c b/librpc/rpc/dcerpc_error.c index 4f0ed6e5dfa..3366f63e916 100644 --- a/librpc/rpc/dcerpc_error.c +++ b/librpc/rpc/dcerpc_error.c @@ -26,58 +26,72 @@ struct dcerpc_fault_table { const char *errstr; uint32_t faultcode; + NTSTATUS nt_status; }; static const struct dcerpc_fault_table dcerpc_faults[] = { -#define _FAULT_STR(x) { #x , x } - _FAULT_STR(DCERPC_NCA_S_COMM_FAILURE), - _FAULT_STR(DCERPC_NCA_S_OP_RNG_ERROR), - _FAULT_STR(DCERPC_NCA_S_UNKNOWN_IF), - _FAULT_STR(DCERPC_NCA_S_WRONG_BOOT_TIME), - _FAULT_STR(DCERPC_NCA_S_YOU_CRASHED), - _FAULT_STR(DCERPC_NCA_S_PROTO_ERROR), - _FAULT_STR(DCERPC_NCA_S_OUT_ARGS_TOO_BIG), - _FAULT_STR(DCERPC_NCA_S_SERVER_TOO_BUSY), - _FAULT_STR(DCERPC_NCA_S_FAULT_STRING_TOO_LARGE), - _FAULT_STR(DCERPC_NCA_S_UNSUPPORTED_TYPE), - _FAULT_STR(DCERPC_NCA_S_FAULT_INT_DIV_BY_ZERO), - _FAULT_STR(DCERPC_NCA_S_FAULT_ADDR_ERROR), - _FAULT_STR(DCERPC_NCA_S_FAULT_FP_DIV_BY_ZERO), - _FAULT_STR(DCERPC_NCA_S_FAULT_FP_UNDERFLOW), - _FAULT_STR(DCERPC_NCA_S_FAULT_FP_OVERRFLOW), - _FAULT_STR(DCERPC_NCA_S_FAULT_INVALID_TAG), - _FAULT_STR(DCERPC_NCA_S_FAULT_INVALID_BOUND), - _FAULT_STR(DCERPC_NCA_S_FAULT_RPC_VERSION_MISMATCH), - _FAULT_STR(DCERPC_NCA_S_FAULT_UNSPEC_REJECT), - _FAULT_STR(DCERPC_NCA_S_FAULT_BAD_ACTID), - _FAULT_STR(DCERPC_NCA_S_FAULT_WHO_ARE_YOU_FAILED), - _FAULT_STR(DCERPC_NCA_S_FAULT_MANAGER_NOT_ENTERED), - _FAULT_STR(DCERPC_NCA_S_FAULT_CANCEL), - _FAULT_STR(DCERPC_NCA_S_FAULT_ILL_INST), - _FAULT_STR(DCERPC_NCA_S_FAULT_FP_ERROR), - _FAULT_STR(DCERPC_NCA_S_FAULT_INT_OVERFLOW), - _FAULT_STR(DCERPC_NCA_S_UNUSED_1C000011), - _FAULT_STR(DCERPC_NCA_S_FAULT_UNSPEC), - _FAULT_STR(DCERPC_NCA_S_FAULT_REMOTE_COMM_FAILURE), - _FAULT_STR(DCERPC_NCA_S_FAULT_PIPE_EMPTY), - _FAULT_STR(DCERPC_NCA_S_FAULT_PIPE_CLOSED), - _FAULT_STR(DCERPC_NCA_S_FAULT_PIPE_ORDER), - _FAULT_STR(DCERPC_NCA_S_FAULT_PIPE_DISCIPLINE), - _FAULT_STR(DCERPC_NCA_S_FAULT_PIPE_COMM_ERROR), - _FAULT_STR(DCERPC_NCA_S_FAULT_PIPE_MEMORY), - _FAULT_STR(DCERPC_NCA_S_FAULT_CONTEXT_MISMATCH), - _FAULT_STR(DCERPC_NCA_S_FAULT_REMOTE_NO_MEMORY), - _FAULT_STR(DCERPC_NCA_S_INVALID_PRES_CONTEXT_ID), - _FAULT_STR(DCERPC_NCA_S_UNSUPPORTED_AUTHN_LEVEL), - _FAULT_STR(DCERPC_NCA_S_UNUSED_1C00001E), - _FAULT_STR(DCERPC_NCA_S_INVALID_CHECKSUM), - _FAULT_STR(DCERPC_NCA_S_INVALID_CRC), - _FAULT_STR(DCERPC_NCA_S_FAULT_USER_DEFINED), - _FAULT_STR(DCERPC_NCA_S_FAULT_TX_OPEN_FAILED), - _FAULT_STR(DCERPC_NCA_S_FAULT_CODESET_CONV_ERROR), - _FAULT_STR(DCERPC_NCA_S_FAULT_OBJECT_NOT_FOUND), - _FAULT_STR(DCERPC_NCA_S_FAULT_NO_CLIENT_STUB), +#define _FAULT_STR(x, s) { .errstr = #x , .faultcode = x, .nt_status = s } +#define _FAULT_STR_NO_NT_MAPPING(x) _FAULT_STR(x, NT_STATUS_RPC_NOT_RPC_ERROR) + _FAULT_STR(DCERPC_NCA_S_COMM_FAILURE, NT_STATUS_RPC_COMM_FAILURE), + _FAULT_STR(DCERPC_NCA_S_OP_RNG_ERROR, NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE), + _FAULT_STR(DCERPC_NCA_S_UNKNOWN_IF, NT_STATUS_RPC_UNKNOWN_IF), + _FAULT_STR_NO_NT_MAPPING(DCERPC_NCA_S_WRONG_BOOT_TIME), + _FAULT_STR_NO_NT_MAPPING(DCERPC_NCA_S_YOU_CRASHED), + _FAULT_STR(DCERPC_NCA_S_PROTO_ERROR, NT_STATUS_RPC_PROTOCOL_ERROR), + _FAULT_STR_NO_NT_MAPPING(DCERPC_NCA_S_OUT_ARGS_TOO_BIG), + _FAULT_STR_NO_NT_MAPPING(DCERPC_NCA_S_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_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), + _FAULT_STR(DCERPC_NCA_S_FAULT_FP_OVERRFLOW, NT_STATUS_RPC_FP_OVERFLOW), + _FAULT_STR(DCERPC_NCA_S_FAULT_INT_DIV_BY_ZERO, NT_STATUS_RPC_FP_DIV_ZERO), + _FAULT_STR(DCERPC_NCA_S_FAULT_INT_OVERFLOW, NT_STATUS_RPC_FP_OVERFLOW), + /* + * What's the difference between NT_STATUS_RPC_INVALID_TAG + * and NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE ??? + * + * Our callers expect NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE. + */ + _FAULT_STR(DCERPC_NCA_S_FAULT_INVALID_TAG, NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE), + _FAULT_STR(DCERPC_NCA_S_FAULT_INVALID_TAG, NT_STATUS_RPC_INVALID_TAG), + _FAULT_STR(DCERPC_NCA_S_FAULT_INVALID_BOUND, NT_STATUS_RPC_INVALID_BOUND), + _FAULT_STR(DCERPC_NCA_S_FAULT_RPC_VERSION_MISMATCH, NT_STATUS_RPC_PROTOCOL_ERROR), + _FAULT_STR_NO_NT_MAPPING(DCERPC_NCA_S_FAULT_UNSPEC_REJECT), + _FAULT_STR_NO_NT_MAPPING(DCERPC_NCA_S_FAULT_BAD_ACTID), + _FAULT_STR_NO_NT_MAPPING(DCERPC_NCA_S_FAULT_WHO_ARE_YOU_FAILED), + _FAULT_STR_NO_NT_MAPPING(DCERPC_NCA_S_FAULT_MANAGER_NOT_ENTERED), + _FAULT_STR(DCERPC_NCA_S_FAULT_CANCEL, NT_STATUS_RPC_CALL_CANCELLED), + _FAULT_STR_NO_NT_MAPPING(DCERPC_NCA_S_FAULT_ILL_INST), + _FAULT_STR_NO_NT_MAPPING(DCERPC_NCA_S_FAULT_FP_ERROR), + _FAULT_STR_NO_NT_MAPPING(DCERPC_NCA_S_UNUSED_1C000011), + _FAULT_STR_NO_NT_MAPPING(DCERPC_NCA_S_FAULT_UNSPEC), + _FAULT_STR_NO_NT_MAPPING(DCERPC_NCA_S_FAULT_REMOTE_COMM_FAILURE), + _FAULT_STR_NO_NT_MAPPING(DCERPC_NCA_S_FAULT_PIPE_EMPTY), + _FAULT_STR(DCERPC_NCA_S_FAULT_PIPE_CLOSED, NT_STATUS_RPC_PIPE_CLOSED), + _FAULT_STR_NO_NT_MAPPING(DCERPC_NCA_S_FAULT_PIPE_ORDER), + _FAULT_STR(DCERPC_NCA_S_FAULT_PIPE_DISCIPLINE, NT_STATUS_RPC_PIPE_DISCIPLINE_ERROR), + _FAULT_STR_NO_NT_MAPPING(DCERPC_NCA_S_FAULT_PIPE_COMM_ERROR), + _FAULT_STR_NO_NT_MAPPING(DCERPC_NCA_S_FAULT_PIPE_MEMORY), + _FAULT_STR(DCERPC_NCA_S_FAULT_CONTEXT_MISMATCH, NT_STATUS_RPC_SS_CONTEXT_MISMATCH), + _FAULT_STR_NO_NT_MAPPING(DCERPC_NCA_S_FAULT_REMOTE_NO_MEMORY), + _FAULT_STR_NO_NT_MAPPING(DCERPC_NCA_S_INVALID_PRES_CONTEXT_ID), + _FAULT_STR(DCERPC_NCA_S_UNSUPPORTED_AUTHN_LEVEL, NT_STATUS_RPC_UNSUPPORTED_AUTHN_LEVEL), + _FAULT_STR_NO_NT_MAPPING(DCERPC_NCA_S_UNUSED_1C00001E), + _FAULT_STR_NO_NT_MAPPING(DCERPC_NCA_S_INVALID_CHECKSUM), + _FAULT_STR_NO_NT_MAPPING(DCERPC_NCA_S_INVALID_CRC), + _FAULT_STR_NO_NT_MAPPING(DCERPC_NCA_S_FAULT_USER_DEFINED), + _FAULT_STR_NO_NT_MAPPING(DCERPC_NCA_S_FAULT_TX_OPEN_FAILED), + _FAULT_STR_NO_NT_MAPPING(DCERPC_NCA_S_FAULT_CODESET_CONV_ERROR), + _FAULT_STR_NO_NT_MAPPING(DCERPC_NCA_S_FAULT_OBJECT_NOT_FOUND), + _FAULT_STR_NO_NT_MAPPING(DCERPC_NCA_S_FAULT_NO_CLIENT_STUB), + _FAULT_STR(DCERPC_FAULT_OTHER, NT_STATUS_RPC_CALL_FAILED), + _FAULT_STR(DCERPC_FAULT_CANT_PERFORM, NT_STATUS_EPT_CANT_PERFORM_OP), + _FAULT_STR(DCERPC_FAULT_NDR, NT_STATUS_RPC_BAD_STUB_DATA), + _FAULT_STR(DCERPC_FAULT_ACCESS_DENIED, NT_STATUS_ACCESS_DENIED), + _FAULT_STR(DCERPC_FAULT_SEC_PKG_ERROR, NT_STATUS_RPC_SEC_PKG_ERROR), { NULL, 0 } #undef _FAULT_STR }; @@ -99,26 +113,19 @@ _PUBLIC_ const char *dcerpc_errstr(TALLOC_CTX *mem_ctx, uint32_t fault_code) _PUBLIC_ NTSTATUS dcerpc_fault_to_nt_status(uint32_t fault_code) { - /* TODO: add more mappings */ - switch (fault_code) { - case DCERPC_NCA_S_OP_RNG_ERROR: - return NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE; - case DCERPC_NCA_S_UNKNOWN_IF: - return NT_STATUS_RPC_UNKNOWN_IF; - case DCERPC_FAULT_NDR: - return NT_STATUS_RPC_BAD_STUB_DATA; - case DCERPC_NCA_S_FAULT_INVALID_TAG: - return NT_STATUS_RPC_ENUM_VALUE_OUT_OF_RANGE; - case DCERPC_NCA_S_FAULT_CONTEXT_MISMATCH: - return NT_STATUS_RPC_SS_CONTEXT_MISMATCH; - case DCERPC_FAULT_OTHER: - return NT_STATUS_RPC_CALL_FAILED; - case DCERPC_FAULT_ACCESS_DENIED: - return NT_STATUS_ACCESS_DENIED; - case DCERPC_FAULT_SEC_PKG_ERROR: - return NT_STATUS_RPC_SEC_PKG_ERROR; + int idx = 0; + WERROR werr = W_ERROR(fault_code); + + if (fault_code == 0) { + return NT_STATUS_RPC_PROTOCOL_ERROR; } - return NT_STATUS_RPC_PROTOCOL_ERROR; -} + while (dcerpc_faults[idx].errstr != NULL) { + if (dcerpc_faults[idx].faultcode == fault_code) { + return dcerpc_faults[idx].nt_status; + } + idx++; + } + return werror_to_ntstatus(werr); +} |