From 7f8bc6a2d904bd5b5c056ec96a68ee928659324a Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Wed, 29 Oct 2008 23:21:06 +0100 Subject: errors: share dcerpc error function. Guenther --- source4/librpc/config.mk | 4 +-- source4/librpc/rpc/dcerpc_error.c | 55 --------------------------------------- 2 files changed, 2 insertions(+), 57 deletions(-) delete mode 100644 source4/librpc/rpc/dcerpc_error.c (limited to 'source4') diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk index a988dcf420..b2b9f2e7a7 100644 --- a/source4/librpc/config.mk +++ b/source4/librpc/config.mk @@ -613,8 +613,8 @@ dcerpc_VERSION = 0.0.1 dcerpc_SOVERSION = 0 dcerpc_OBJ_FILES = $(addprefix $(dcerpcsrcdir)/, dcerpc.o dcerpc_auth.o dcerpc_schannel.o dcerpc_util.o \ - dcerpc_error.o dcerpc_smb.o dcerpc_smb2.o dcerpc_sock.o dcerpc_connect.o dcerpc_secondary.o) \ - ../librpc/rpc/binding.o + dcerpc_smb.o dcerpc_smb2.o dcerpc_sock.o dcerpc_connect.o dcerpc_secondary.o) \ + ../librpc/rpc/binding.o ../librpc/rpc/dcerpc_error.o $(eval $(call proto_header_template,$(dcerpcsrcdir)/dcerpc_proto.h,$(dcerpc_OBJ_FILES:.o=.c))) diff --git a/source4/librpc/rpc/dcerpc_error.c b/source4/librpc/rpc/dcerpc_error.c deleted file mode 100644 index 6ea4563ae6..0000000000 --- a/source4/librpc/rpc/dcerpc_error.c +++ /dev/null @@ -1,55 +0,0 @@ -/* - Unix SMB/CIFS implementation. - - dcerpc fault functions - - Copyright (C) Stefan Metzmacher 2004 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*/ - -#include "includes.h" -#include "librpc/rpc/dcerpc.h" - -struct dcerpc_fault_table { - const char *errstr; - uint32_t faultcode; -}; - -static const struct dcerpc_fault_table dcerpc_faults[] = -{ - { "DCERPC_FAULT_OP_RNG_ERROR", DCERPC_FAULT_OP_RNG_ERROR }, - { "DCERPC_FAULT_UNK_IF", DCERPC_FAULT_UNK_IF }, - { "DCERPC_FAULT_NDR", DCERPC_FAULT_NDR }, - { "DCERPC_FAULT_INVALID_TAG", DCERPC_FAULT_INVALID_TAG }, - { "DCERPC_FAULT_CONTEXT_MISMATCH", DCERPC_FAULT_CONTEXT_MISMATCH }, - { "DCERPC_FAULT_OTHER", DCERPC_FAULT_OTHER }, - { "DCERPC_FAULT_ACCESS_DENIED", DCERPC_FAULT_ACCESS_DENIED }, - - { NULL, 0} -}; - -_PUBLIC_ const char *dcerpc_errstr(TALLOC_CTX *mem_ctx, uint32_t fault_code) -{ - int idx = 0; - - while (dcerpc_faults[idx].errstr != NULL) { - if (dcerpc_faults[idx].faultcode == fault_code) { - return dcerpc_faults[idx].errstr; - } - idx++; - } - - return talloc_asprintf(mem_ctx, "DCERPC fault 0x%08x", fault_code); -} -- cgit