DOS error 31 is ERRgeneral, General Failure. This is the WERROR equivalent

to NT_STATUS_UNSUCCESSFUL according to AB's funky new error map.

diff --git a/source/include/doserr.h b/source/include/doserr.h
index 09f7a36f9f3679969d96e0374274c8c4b47702d5..3262370dfd82f31500f2878efd7c205fd8cee967 100644 (file)
--- a/source/include/doserr.h
+++ b/source/include/doserr.h
@@ -51,6 +51,7 @@
 #define ERRremcd 16 /* Attempt to delete current directory */
 #define ERRdiffdevice 17 /* rename/move across different filesystems */
 #define ERRnofiles 18 /* no more files found in file search */
+#define ERRgeneral 31 /* General failure */
 #define ERRbadshare 32 /* Share mode on file conflict with open mode */
 #define ERRlock 33 /* Lock request conflicts with existing lock */
 #define ERRunsup 50 /* Request unsupported, returned by Win 95, RJS 20Jun98 */

diff --git a/source/libsmb/errormap.c b/source/libsmb/errormap.c
index b2b638b2293167505d77fcca2451e06561135fb3..1c44675c83ae31bd8ef76ec6de9407fb08841e06 100644 (file)
--- a/source/libsmb/errormap.c
+++ b/source/libsmb/errormap.c
@@ -49,7 +49,7 @@ static struct {
        uint32 dos_code;
        NTSTATUS ntstatus;
 } ntstatus_to_dos_map[] = {
-       {ERRDOS,        31,     NT_STATUS_UNSUCCESSFUL},
+       {ERRDOS,        ERRgeneral,     NT_STATUS_UNSUCCESSFUL},
        {ERRDOS,        ERRbadfunc,     NT_STATUS_NOT_IMPLEMENTED},
        {ERRDOS,        87,     NT_STATUS_INVALID_INFO_CLASS},
        {ERRDOS,        24,     NT_STATUS_INFO_LENGTH_MISMATCH},