summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2007-12-21 15:28:01 +0100
committerGünther Deschner <gd@samba.org>2007-12-21 15:28:21 +0100
commitc000a166459468e0cfd5277fa717f8fc9ed8311f (patch)
tree939cfeba767f5ffbc15f2f565d3e8568e1e9a988
parent8ded1df76739363259edce0515b097510e342595 (diff)
downloadsamba-c000a166459468e0cfd5277fa717f8fc9ed8311f.tar.gz
samba-c000a166459468e0cfd5277fa717f8fc9ed8311f.tar.bz2
samba-c000a166459468e0cfd5277fa717f8fc9ed8311f.zip
Add get_friendly_werror_msg().
Guenther (This used to be commit b1ad3def98911c91ed55a3b7aec7d0894b2dd8fd)
-rw-r--r--source3/libsmb/doserr.c52
1 files changed, 45 insertions, 7 deletions
diff --git a/source3/libsmb/doserr.c b/source3/libsmb/doserr.c
index 5bdd85da1b..dd556bba5a 100644
--- a/source3/libsmb/doserr.c
+++ b/source3/libsmb/doserr.c
@@ -1,18 +1,18 @@
-/*
+/*
* Unix SMB/CIFS implementation.
* DOS error routines
* Copyright (C) Tim Potter 2002.
- *
+ *
* 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/>.
*/
@@ -21,12 +21,16 @@
#include "includes.h"
-typedef const struct
-{
+typedef const struct {
const char *dos_errstr;
WERROR werror;
} werror_code_struct;
+typedef const struct {
+ WERROR werror;
+ const char *friendly_errstr;
+} werror_str_struct;
+
werror_code_struct dos_errs[] =
{
{ "WERR_OK", WERR_OK },
@@ -92,6 +96,22 @@ werror_code_struct dos_errs[] =
{ NULL, W_ERROR(0) }
};
+werror_str_struct dos_err_strs[] = {
+ { WERR_OK, "Success" },
+ { WERR_ACCESS_DENIED, "Access is denied" },
+ { WERR_INVALID_PARAM, "Invalid parameter" },
+ { WERR_NOT_SUPPORTED, "Not supported" },
+ { WERR_BAD_PASSWORD, "A bad password was supplied" },
+ { WERR_NOMEM, "Out of memory" },
+ { WERR_NO_LOGON_SERVERS, "No logon servers found" },
+ { WERR_NO_SUCH_LOGON_SESSION, "No such logon session" },
+ { WERR_DOMAIN_CONTROLLER_NOT_FOUND, "A domain controller could not be found" },
+ { WERR_SETUP_NOT_JOINED, "Join failed" },
+ { WERR_SETUP_ALREADY_JOINED, "Machine is already joined" },
+ { WERR_SETUP_DOMAIN_CONTROLLER, "Machine is a Domain Controller" },
+ { WERR_LOGON_FAILURE, "Invalid logon credentials" },
+};
+
/*****************************************************************************
Returns a DOS error message. not amazingly helpful, but better than a number.
*****************************************************************************/
@@ -102,7 +122,7 @@ const char *dos_errstr(WERROR werror)
int idx = 0;
while (dos_errs[idx].dos_errstr != NULL) {
- if (W_ERROR_V(dos_errs[idx].werror) ==
+ if (W_ERROR_V(dos_errs[idx].werror) ==
W_ERROR_V(werror))
return dos_errs[idx].dos_errstr;
idx++;
@@ -114,6 +134,24 @@ const char *dos_errstr(WERROR werror)
return result;
}
+/*****************************************************************************
+ Get friendly error string for WERRORs
+ *****************************************************************************/
+
+const char *get_friendly_werror_msg(WERROR werror)
+{
+ int i = 0;
+
+ for (i = 0; i < ARRAY_SIZE(dos_err_strs); i++) {
+ if (W_ERROR_V(dos_err_strs[i].werror) ==
+ W_ERROR_V(werror)) {
+ return dos_err_strs[i].friendly_errstr;
+ }
+ }
+
+ return dos_errstr(werror);
+}
+
/* compat function for samba4 */
const char *win_errstr(WERROR werror)
{