summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2011-02-24 22:29:16 +0100
committerGünther Deschner <gd@samba.org>2011-02-25 01:08:41 +0100
commit313db81ad3de6cf7759d6a0fc21ee32419b2e62b (patch)
tree8a81c8b01052e55ea8e6393661ea6b5f61f58c4d
parentde8b373329931c921d95bf4f622d5713675288d9 (diff)
downloadsamba-313db81ad3de6cf7759d6a0fc21ee32419b2e62b.tar.gz
samba-313db81ad3de6cf7759d6a0fc21ee32419b2e62b.tar.bz2
samba-313db81ad3de6cf7759d6a0fc21ee32419b2e62b.zip
s3-errormap: move (unused) map_nt_error_from_wbcErr out of errormap.
Guenther
-rw-r--r--source3/include/proto.h1
-rw-r--r--source3/libsmb/errormap.c39
-rw-r--r--source3/libsmb/errormap_wbc.c63
-rw-r--r--source3/libsmb/errormap_wbc.h3
4 files changed, 66 insertions, 40 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index fe4a2c1e37..ae048af19f 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2602,7 +2602,6 @@ NTSTATUS dos_to_ntstatus(uint8 eclass, uint32 ecode);
void ntstatus_to_dos(NTSTATUS ntstatus, uint8 *eclass, uint32 *ecode);
NTSTATUS werror_to_ntstatus(WERROR error);
WERROR ntstatus_to_werror(NTSTATUS error);
-NTSTATUS map_nt_error_from_wbcErr(wbcErr wbc_err);
NTSTATUS map_nt_error_from_gss(uint32 gss_maj, uint32 minor);
/* The following definitions come from libsmb/namecache.c */
diff --git a/source3/libsmb/errormap.c b/source3/libsmb/errormap.c
index babe6b993d..71efff37a5 100644
--- a/source3/libsmb/errormap.c
+++ b/source3/libsmb/errormap.c
@@ -1506,45 +1506,6 @@ WERROR ntstatus_to_werror(NTSTATUS error)
return W_ERROR(NT_STATUS_V(error) & 0xffff);
}
-/*******************************************************************************
- Map between wbcErr and NT status.
-*******************************************************************************/
-
-static const struct {
- wbcErr wbc_err;
- NTSTATUS nt_status;
-} wbcErr_ntstatus_map[] = {
- { WBC_ERR_SUCCESS, NT_STATUS_OK },
- { WBC_ERR_NOT_IMPLEMENTED, NT_STATUS_NOT_IMPLEMENTED },
- { WBC_ERR_UNKNOWN_FAILURE, NT_STATUS_UNSUCCESSFUL },
- { WBC_ERR_NO_MEMORY, NT_STATUS_NO_MEMORY },
- { WBC_ERR_INVALID_SID, NT_STATUS_INVALID_SID },
- { WBC_ERR_INVALID_PARAM, NT_STATUS_INVALID_PARAMETER },
- { WBC_ERR_WINBIND_NOT_AVAILABLE, NT_STATUS_SERVER_DISABLED },
- { WBC_ERR_DOMAIN_NOT_FOUND, NT_STATUS_NO_SUCH_DOMAIN },
- { WBC_ERR_INVALID_RESPONSE, NT_STATUS_INVALID_NETWORK_RESPONSE },
- { WBC_ERR_NSS_ERROR, NT_STATUS_INTERNAL_ERROR },
- { WBC_ERR_AUTH_ERROR, NT_STATUS_LOGON_FAILURE },
- { WBC_ERR_UNKNOWN_USER, NT_STATUS_NO_SUCH_USER },
- { WBC_ERR_UNKNOWN_GROUP, NT_STATUS_NO_SUCH_GROUP },
- { WBC_ERR_PWD_CHANGE_FAILED, NT_STATUS_PASSWORD_RESTRICTION }
-};
-
-NTSTATUS map_nt_error_from_wbcErr(wbcErr wbc_err)
-{
- int i;
-
- /* Look through list */
- for (i=0;i<ARRAY_SIZE(wbcErr_ntstatus_map);i++) {
- if (wbcErr_ntstatus_map[i].wbc_err == wbc_err) {
- return wbcErr_ntstatus_map[i].nt_status;
- }
- }
-
- /* Default return */
- return NT_STATUS_UNSUCCESSFUL;
-}
-
#if defined(HAVE_GSSAPI)
/*******************************************************************************
diff --git a/source3/libsmb/errormap_wbc.c b/source3/libsmb/errormap_wbc.c
new file mode 100644
index 0000000000..b7e6ec067e
--- /dev/null
+++ b/source3/libsmb/errormap_wbc.c
@@ -0,0 +1,63 @@
+/*
+ * Unix SMB/CIFS implementation.
+ * error mapping functions
+ * Copyright (C) Andrew Tridgell 2001
+ * Copyright (C) Andrew Bartlett 2001
+ * Copyright (C) Tim Potter 2000
+ *
+ * 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/>.
+ */
+
+#include "includes.h"
+#include "nsswitch/libwbclient/wbclient.h"
+
+/*******************************************************************************
+ Map between wbcErr and NT status.
+*******************************************************************************/
+
+static const struct {
+ wbcErr wbc_err;
+ NTSTATUS nt_status;
+} wbcErr_ntstatus_map[] = {
+ { WBC_ERR_SUCCESS, NT_STATUS_OK },
+ { WBC_ERR_NOT_IMPLEMENTED, NT_STATUS_NOT_IMPLEMENTED },
+ { WBC_ERR_UNKNOWN_FAILURE, NT_STATUS_UNSUCCESSFUL },
+ { WBC_ERR_NO_MEMORY, NT_STATUS_NO_MEMORY },
+ { WBC_ERR_INVALID_SID, NT_STATUS_INVALID_SID },
+ { WBC_ERR_INVALID_PARAM, NT_STATUS_INVALID_PARAMETER },
+ { WBC_ERR_WINBIND_NOT_AVAILABLE, NT_STATUS_SERVER_DISABLED },
+ { WBC_ERR_DOMAIN_NOT_FOUND, NT_STATUS_NO_SUCH_DOMAIN },
+ { WBC_ERR_INVALID_RESPONSE, NT_STATUS_INVALID_NETWORK_RESPONSE },
+ { WBC_ERR_NSS_ERROR, NT_STATUS_INTERNAL_ERROR },
+ { WBC_ERR_AUTH_ERROR, NT_STATUS_LOGON_FAILURE },
+ { WBC_ERR_UNKNOWN_USER, NT_STATUS_NO_SUCH_USER },
+ { WBC_ERR_UNKNOWN_GROUP, NT_STATUS_NO_SUCH_GROUP },
+ { WBC_ERR_PWD_CHANGE_FAILED, NT_STATUS_PASSWORD_RESTRICTION }
+};
+
+NTSTATUS map_nt_error_from_wbcErr(wbcErr wbc_err)
+{
+ int i;
+
+ /* Look through list */
+ for (i=0;i<ARRAY_SIZE(wbcErr_ntstatus_map);i++) {
+ if (wbcErr_ntstatus_map[i].wbc_err == wbc_err) {
+ return wbcErr_ntstatus_map[i].nt_status;
+ }
+ }
+
+ /* Default return */
+ return NT_STATUS_UNSUCCESSFUL;
+}
+
diff --git a/source3/libsmb/errormap_wbc.h b/source3/libsmb/errormap_wbc.h
new file mode 100644
index 0000000000..2042da4efc
--- /dev/null
+++ b/source3/libsmb/errormap_wbc.h
@@ -0,0 +1,3 @@
+/* The following definitions come from libsmb/errormap_wbc.c */
+
+NTSTATUS map_nt_error_from_wbcErr(wbcErr wbc_err);