summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2006-09-18 20:44:54 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:18:58 -0500
commitf3fd73ed52349a75890c30a7dfac72fa20618e3a (patch)
treef22b2e88db8c5843d7000e1e248a456d6e7f47e2
parent1eebe9cbe5ad8123cd86ee84ebe93cd493f206a9 (diff)
downloadsamba-f3fd73ed52349a75890c30a7dfac72fa20618e3a.tar.gz
samba-f3fd73ed52349a75890c30a7dfac72fa20618e3a.tar.bz2
samba-f3fd73ed52349a75890c30a7dfac72fa20618e3a.zip
r18633: Add a couple of new WERR codes encountered with dfs torture testing.
Guenther (This used to be commit e2879f6fc21e5ca96b24ed11e4a460a0ebada8c3)
-rw-r--r--source4/libcli/util/doserr.c7
-rw-r--r--source4/libcli/util/doserr.h7
2 files changed, 12 insertions, 2 deletions
diff --git a/source4/libcli/util/doserr.c b/source4/libcli/util/doserr.c
index c7d7053165..c0a4e2cb96 100644
--- a/source4/libcli/util/doserr.c
+++ b/source4/libcli/util/doserr.c
@@ -36,9 +36,10 @@ static const struct werror_code_struct dos_errs[] =
{ "WERR_BADFID", WERR_BADFID },
{ "WERR_BADFUNC", WERR_BADFUNC },
{ "WERR_BAD_NETPATH", WERR_BAD_NETPATH },
+ { "WERR_UNEXP_NET_ERR", WERR_UNEXP_NET_ERR },
{ "WERR_INSUFFICIENT_BUFFER", WERR_INSUFFICIENT_BUFFER },
{ "WERR_NO_SUCH_SHARE", WERR_NO_SUCH_SHARE },
- { "WERR_ALREADY_EXISTS", WERR_ALREADY_EXISTS },
+ { "WERR_FILE_EXISTS", WERR_FILE_EXISTS },
{ "WERR_INVALID_PARAM", WERR_INVALID_PARAM },
{ "WERR_NOT_SUPPORTED", WERR_NOT_SUPPORTED },
{ "WERR_BAD_PASSWORD", WERR_BAD_PASSWORD },
@@ -46,6 +47,7 @@ static const struct werror_code_struct dos_errs[] =
{ "WERR_INVALID_NAME", WERR_INVALID_NAME },
{ "WERR_UNKNOWN_LEVEL", WERR_UNKNOWN_LEVEL },
{ "WERR_OBJECT_PATH_INVALID", WERR_OBJECT_PATH_INVALID },
+ { "WERR_ALREADY_EXISTS", WERR_ALREADY_EXISTS },
{ "WERR_NO_MORE_ITEMS", WERR_NO_MORE_ITEMS },
{ "WERR_MORE_DATA", WERR_MORE_DATA },
{ "WERR_UNKNOWN_PRINTER_DRIVER", WERR_UNKNOWN_PRINTER_DRIVER },
@@ -55,10 +57,12 @@ static const struct werror_code_struct dos_errs[] =
{ "WERR_INVALID_ENVIRONMENT", WERR_INVALID_ENVIRONMENT },
{ "WERR_INVALID_FORM_NAME", WERR_INVALID_FORM_NAME },
{ "WERR_INVALID_FORM_SIZE", WERR_INVALID_FORM_SIZE },
+ { "WERR_ALREADY_SHARED", WERR_ALREADY_SHARED },
{ "WERR_BUF_TOO_SMALL", WERR_BUF_TOO_SMALL },
{ "WERR_JOB_NOT_FOUND", WERR_JOB_NOT_FOUND },
{ "WERR_DEST_NOT_FOUND", WERR_DEST_NOT_FOUND },
{ "WERR_NOT_LOCAL_DOMAIN", WERR_NOT_LOCAL_DOMAIN },
+ { "WERR_DEVICE_NOT_AVAILABLE", WERR_DEVICE_NOT_AVAILABLE },
{ "WERR_PRINTER_DRIVER_IN_USE", WERR_PRINTER_DRIVER_IN_USE },
{ "WERR_STATUS_MORE_ENTRIES", WERR_STATUS_MORE_ENTRIES },
{ "WERR_NET_NAME_NOT_FOUND", WERR_NET_NAME_NOT_FOUND },
@@ -97,6 +101,7 @@ static const struct werror_code_struct dos_errs[] =
{ "WERR_PRINTQ_FULL", WERR_PRINTQ_FULL },
{ "WERR_NO_SPOOL_SPACE", WERR_NO_SPOOL_SPACE },
{ "WERR_CAN_NOT_COMPLETE", WERR_CAN_NOT_COMPLETE },
+ { "WERR_NOT_FOUND", WERR_NOT_FOUND },
{ "WERR_SERVER_UNAVAILABLE", WERR_SERVER_UNAVAILABLE },
{ "WERR_CLASS_NOT_REGISTERED", WERR_CLASS_NOT_REGISTERED },
{ "WERR_NO_SHUTDOWN_IN_PROGRESS", WERR_NO_SHUTDOWN_IN_PROGRESS },
diff --git a/source4/libcli/util/doserr.h b/source4/libcli/util/doserr.h
index 32807da47c..d80cdd1052 100644
--- a/source4/libcli/util/doserr.h
+++ b/source4/libcli/util/doserr.h
@@ -174,19 +174,22 @@
#define WERR_GENERAL_FAILURE W_ERROR(31)
#define WERR_NOT_SUPPORTED W_ERROR(50)
#define WERR_BAD_NETPATH W_ERROR(53)
+#define WERR_UNEXP_NET_ERR W_ERROR(59)
#define WERR_PRINTQ_FULL W_ERROR(61)
#define WERR_NO_SPOOL_SPACE W_ERROR(62)
#define WERR_NO_SUCH_SHARE W_ERROR(67)
-#define WERR_ALREADY_EXISTS W_ERROR(80)
+#define WERR_FILE_EXISTS W_ERROR(80)
#define WERR_BAD_PASSWORD W_ERROR(86)
#define WERR_INVALID_PARAM W_ERROR(87)
#define WERR_INSUFFICIENT_BUFFER W_ERROR(122)
#define WERR_INVALID_NAME W_ERROR(123)
#define WERR_UNKNOWN_LEVEL W_ERROR(124)
#define WERR_OBJECT_PATH_INVALID W_ERROR(161)
+#define WERR_ALREADY_EXISTS W_ERROR(183)
#define WERR_NO_MORE_ITEMS W_ERROR(259)
#define WERR_MORE_DATA W_ERROR(234)
#define WERR_CAN_NOT_COMPLETE W_ERROR(1003)
+#define WERR_NOT_FOUND W_ERROR(1168)
#define WERR_INVALID_COMPUTERNAME W_ERROR(1210)
#define WERR_INVALID_DOMAINNAME W_ERROR(1212)
#define WERR_UNKNOWN_REVISION W_ERROR(1305)
@@ -200,10 +203,12 @@
#define WERR_SERVER_UNAVAILABLE W_ERROR(1722)
#define WERR_INVALID_FORM_NAME W_ERROR(1902)
#define WERR_INVALID_FORM_SIZE W_ERROR(1903)
+#define WERR_ALREADY_SHARED W_ERROR(2118)
#define WERR_BUF_TOO_SMALL W_ERROR(2123)
#define WERR_JOB_NOT_FOUND W_ERROR(2151)
#define WERR_DEST_NOT_FOUND W_ERROR(2152)
#define WERR_NOT_LOCAL_DOMAIN W_ERROR(2320)
+#define WERR_DEVICE_NOT_AVAILABLE W_ERROR(4319)
#define WERR_STATUS_MORE_ENTRIES W_ERROR(0x0105)
#define WERR_PRINTER_DRIVER_ALREADY_INSTALLED W_ERROR(ERRdriveralreadyinstalled)