summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-06-17 14:40:26 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-06-17 17:09:00 +1000
commite645675aa46e945da5293b54a1bd368599b7b5a7 (patch)
tree296438762619c2c0d9a757db9f420b5c46868d7d
parent264409750a569b632576e8cd6fddd72fc29e9660 (diff)
downloadsamba-e645675aa46e945da5293b54a1bd368599b7b5a7.tar.gz
samba-e645675aa46e945da5293b54a1bd368599b7b5a7.tar.bz2
samba-e645675aa46e945da5293b54a1bd368599b7b5a7.zip
s4-util: removed the s4 nterr.c
this is now in common code Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
-rw-r--r--source4/libcli/util/nterr.c54
-rw-r--r--source4/libcli/wscript_build2
2 files changed, 1 insertions, 55 deletions
diff --git a/source4/libcli/util/nterr.c b/source4/libcli/util/nterr.c
deleted file mode 100644
index 1532b5b787..0000000000
--- a/source4/libcli/util/nterr.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Unix SMB/CIFS implementation.
- * RPC Pipe client / server routines
- * Copyright (C) Luke Kenneth Casson Leighton 1997-2001.
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/* NT error codes. please read nterr.h */
-
-#include "includes.h"
-#include "../libcli/ldap/ldap_errors.h"
-#undef strcasecmp
-
-extern const nt_err_code_struct nt_errs[];
-extern const nt_err_code_struct nt_err_desc[];
-
-/*****************************************************************************
- Returns an NT error message. not amazingly helpful, but better than a number.
- *****************************************************************************/
-
-const char *nt_errstr(NTSTATUS nt_code)
-{
- static char msg[40];
- int idx = 0;
-
- while (nt_errs[idx].nt_errstr != NULL) {
- if (NT_STATUS_V(nt_errs[idx].nt_errcode) ==
- NT_STATUS_V(nt_code)) {
- return nt_errs[idx].nt_errstr;
- }
- idx++;
- }
-
- if (NT_STATUS_IS_LDAP(nt_code)) {
- slprintf(msg, sizeof(msg), "LDAP code %u", NT_STATUS_LDAP_CODE(nt_code));
- return msg;
- }
-
- slprintf(msg, sizeof(msg), "NT code 0x%08x", NT_STATUS_V(nt_code));
-
- return msg;
-}
diff --git a/source4/libcli/wscript_build b/source4/libcli/wscript_build
index d9e85d610e..02bb3b8d36 100644
--- a/source4/libcli/wscript_build
+++ b/source4/libcli/wscript_build
@@ -4,7 +4,7 @@ bld.RECURSE('ldap')
bld.RECURSE('wbclient')
bld.SAMBA_LIBRARY('errors',
- source='util/errormap.c util/nterr.c',
+ source='util/errormap.c',
public_headers='../../libcli/util/error.h ../../libcli/util/ntstatus.h ../../libcli/util/doserr.h ../../libcli/util/werror.h',
header_path='core',
deps='talloc LIBCLI_ERRORS',