s3-lib Remove unused dos error codes from errmap_unix

This also makes unix_nt_errmap private to errmap_unix.c and errormap.c
so the tables themselves cannot be duplicate symbols until merged.

Andrew Bartlett

diff --git a/source3/include/smb.h b/source3/include/smb.h
index 28bc49f85849635a2688900d21c3bf4c0d5efb8f..d584a9db45e4951f53b19709e935fa707a252f9f 100644 (file)
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1549,13 +1549,6 @@ typedef struct user_struct {
        struct auth_ntlmssp_state *auth_ntlmssp_state;
 } user_struct;
 
-struct unix_error_map {
-       int unix_error;
-       int dos_class;
-       int dos_code;
-       NTSTATUS nt_error;
-};
-
 /*
    Do you want session setups at user level security with a invalid
    password to be rejected or allowed in as guest? WinNT rejects them

diff --git a/source3/lib/errmap_unix.c b/source3/lib/errmap_unix.c
index b4a98f963423a21a53581626ce7bc2754b507643..1d5f4d848609a804d7213cfe1bcffe8a82f1abd6 100644 (file)
--- a/source3/lib/errmap_unix.c
+++ b/source3/lib/errmap_unix.c
@@ -24,91 +24,94 @@
 
 /* Mapping from Unix, to NT error numbers */
 
-const struct unix_error_map unix_dos_nt_errmap[] = {
-       { EPERM, ERRDOS, ERRnoaccess, NT_STATUS_ACCESS_DENIED },
-       { EACCES, ERRDOS, ERRnoaccess, NT_STATUS_ACCESS_DENIED },
-       { ENOENT, ERRDOS, ERRbadfile, NT_STATUS_OBJECT_NAME_NOT_FOUND },
-       { ENOTDIR, ERRDOS, ERRbadpath,  NT_STATUS_NOT_A_DIRECTORY },
-       { EIO, ERRHRD, ERRgeneral, NT_STATUS_IO_DEVICE_ERROR },
-       { EBADF, ERRSRV, ERRsrverror, NT_STATUS_INVALID_HANDLE },
-       { EINVAL, ERRSRV, ERRsrverror, NT_STATUS_INVALID_PARAMETER },
-       { EEXIST, ERRDOS, ERRfilexists, NT_STATUS_OBJECT_NAME_COLLISION},
-       { ENFILE, ERRDOS, ERRnofids, NT_STATUS_TOO_MANY_OPENED_FILES },
-       { EMFILE, ERRDOS, ERRnofids, NT_STATUS_TOO_MANY_OPENED_FILES },
-       { ENOSPC, ERRHRD, ERRdiskfull, NT_STATUS_DISK_FULL },
-       { ENOMEM, ERRDOS, ERRnomem, NT_STATUS_NO_MEMORY },
-       { EISDIR, ERRDOS, ERRnoaccess, NT_STATUS_FILE_IS_A_DIRECTORY},
-       { EMLINK, ERRDOS, ERRgeneral, NT_STATUS_TOO_MANY_LINKS },
-       { EINTR,  ERRHRD, ERRgeneral, NT_STATUS_RETRY },
-       { ENOSYS, ERRDOS, ERRunsup, NT_STATUS_NOT_SUPPORTED },
+static const struct {
+       int unix_error;
+       NTSTATUS nt_error;
+} unix_nt_errmap[] = {
+       { EPERM, NT_STATUS_ACCESS_DENIED },
+       { EACCES, NT_STATUS_ACCESS_DENIED },
+       { ENOENT, NT_STATUS_OBJECT_NAME_NOT_FOUND },
+       { ENOTDIR, NT_STATUS_NOT_A_DIRECTORY },
+       { EIO, NT_STATUS_IO_DEVICE_ERROR },
+       { EBADF, NT_STATUS_INVALID_HANDLE },
+       { EINVAL, NT_STATUS_INVALID_PARAMETER },
+       { EEXIST, NT_STATUS_OBJECT_NAME_COLLISION},
+       { ENFILE, NT_STATUS_TOO_MANY_OPENED_FILES },
+       { EMFILE, NT_STATUS_TOO_MANY_OPENED_FILES },
+       { ENOSPC, NT_STATUS_DISK_FULL },
+       { ENOMEM, NT_STATUS_NO_MEMORY },
+       { EISDIR, NT_STATUS_FILE_IS_A_DIRECTORY},
+       { EMLINK, NT_STATUS_TOO_MANY_LINKS },
+       { EINTR,  NT_STATUS_RETRY },
+       { ENOSYS, NT_STATUS_NOT_SUPPORTED },
 #ifdef ELOOP
-       { ELOOP, ERRDOS, ERRbadpath, NT_STATUS_OBJECT_PATH_NOT_FOUND },
+       { ELOOP, NT_STATUS_OBJECT_PATH_NOT_FOUND },
 #endif
 #ifdef EFTYPE
-       { EFTYPE, ERRDOS, ERRbadpath, NT_STATUS_OBJECT_PATH_NOT_FOUND },
+       { EFTYPE, NT_STATUS_OBJECT_PATH_NOT_FOUND },
 #endif
 #ifdef EDQUOT
-       { EDQUOT, ERRHRD, ERRdiskfull, NT_STATUS_DISK_FULL }, /* Windows apps need this, not NT_STATUS_QUOTA_EXCEEDED */
+       { EDQUOT, NT_STATUS_DISK_FULL }, /* Windows apps need this, not NT_STATUS_QUOTA_EXCEEDED */
 #endif
 #ifdef ENOTEMPTY
-       { ENOTEMPTY, ERRDOS, ERRnoaccess, NT_STATUS_DIRECTORY_NOT_EMPTY },
+       { ENOTEMPTY, NT_STATUS_DIRECTORY_NOT_EMPTY },
 #endif
 #ifdef EXDEV
-       { EXDEV, ERRDOS, ERRdiffdevice, NT_STATUS_NOT_SAME_DEVICE },
+       { EXDEV, NT_STATUS_NOT_SAME_DEVICE },
 #endif
 #ifdef EROFS
-       { EROFS, ERRHRD, ERRnowrite, NT_STATUS_ACCESS_DENIED },
+       { EROFS, NT_STATUS_ACCESS_DENIED },
 #endif
 #ifdef ENAMETOOLONG
-       { ENAMETOOLONG, ERRDOS, 206, NT_STATUS_OBJECT_NAME_INVALID },
+       { ENAMETOOLONG, NT_STATUS_OBJECT_NAME_INVALID },
 #endif
 #ifdef EFBIG
-       { EFBIG, ERRHRD, ERRdiskfull, NT_STATUS_DISK_FULL },
+       { EFBIG, NT_STATUS_DISK_FULL },
 #endif
 #ifdef ENOBUFS
-       { ENOBUFS, ERRDOS, ERRnomem, NT_STATUS_INSUFFICIENT_RESOURCES },
+       { ENOBUFS, NT_STATUS_INSUFFICIENT_RESOURCES },
 #endif
-       { EAGAIN, ERRDOS, 111, NT_STATUS_NETWORK_BUSY },
+       { EAGAIN, NT_STATUS_NETWORK_BUSY },
 #ifdef EADDRINUSE
-       { EADDRINUSE, ERRDOS, 52, NT_STATUS_ADDRESS_ALREADY_ASSOCIATED},
+       { EADDRINUSE, NT_STATUS_ADDRESS_ALREADY_ASSOCIATED},
 #endif
 #ifdef ENETUNREACH
-       { ENETUNREACH, ERRHRD, ERRgeneral, NT_STATUS_NETWORK_UNREACHABLE},
+       { ENETUNREACH, NT_STATUS_NETWORK_UNREACHABLE},
 #endif
 #ifdef EHOSTUNREACH
-               { EHOSTUNREACH, ERRHRD, ERRgeneral, NT_STATUS_HOST_UNREACHABLE},
+               { EHOSTUNREACH, NT_STATUS_HOST_UNREACHABLE},
 #endif
 #ifdef ECONNREFUSED
-       { ECONNREFUSED, ERRHRD, ERRgeneral, NT_STATUS_CONNECTION_REFUSED},
+       { ECONNREFUSED, NT_STATUS_CONNECTION_REFUSED},
 #endif
 #ifdef ETIMEDOUT
-       { ETIMEDOUT, ERRHRD, 121, NT_STATUS_IO_TIMEOUT},
+       { ETIMEDOUT, NT_STATUS_IO_TIMEOUT},
 #endif
 #ifdef ECONNABORTED
-       { ECONNABORTED, ERRHRD, ERRgeneral, NT_STATUS_CONNECTION_ABORTED},
+       { ECONNABORTED, NT_STATUS_CONNECTION_ABORTED},
 #endif
 #ifdef ECONNRESET
-       { ECONNRESET, ERRHRD, ERRgeneral, NT_STATUS_CONNECTION_RESET},
+       { ECONNRESET, NT_STATUS_CONNECTION_RESET},
 #endif
 #ifdef ENODEV
-       { ENODEV, ERRDOS, 55, NT_STATUS_DEVICE_DOES_NOT_EXIST},
+       { ENODEV, NT_STATUS_DEVICE_DOES_NOT_EXIST},
 #endif
 #ifdef EPIPE
-       { EPIPE, ERRDOS, 109, NT_STATUS_PIPE_BROKEN},
+       { EPIPE, NT_STATUS_PIPE_BROKEN},
 #endif
 #ifdef EWOULDBLOCK
-       { EWOULDBLOCK, ERRDOS, 111, NT_STATUS_NETWORK_BUSY },
+       { EWOULDBLOCK, NT_STATUS_NETWORK_BUSY },
 #endif
 #ifdef ENOATTR
-       { ENOATTR, ERRDOS, ERRbadfile, NT_STATUS_NOT_FOUND },
+       { ENOATTR, NT_STATUS_NOT_FOUND },
 #endif
 #ifdef ECANCELED
-       { ECANCELED, ERRDOS, ERRbadfid, NT_STATUS_CANCELLED},
+       { ECANCELED, NT_STATUS_CANCELLED},
 #endif
 #ifdef ENOTSUP
-        { ENOTSUP, ERRSRV, ERRnosupport, NT_STATUS_NOT_SUPPORTED},
+        { ENOTSUP, NT_STATUS_NOT_SUPPORTED},
 #endif
-       { 0, 0, 0, NT_STATUS_OK }
+       { 0, NT_STATUS_OK }
 };
 
 /*********************************************************************
@@ -131,9 +134,9 @@ NTSTATUS map_nt_error_from_unix(int unix_error)
        }
 
        /* Look through list */
-       while(unix_dos_nt_errmap[i].unix_error != 0) {
-               if (unix_dos_nt_errmap[i].unix_error == unix_error)
-                       return unix_dos_nt_errmap[i].nt_error;
+       while(unix_nt_errmap[i].unix_error != 0) {
+               if (unix_nt_errmap[i].unix_error == unix_error)
+                       return unix_nt_errmap[i].nt_error;
                i++;
        }
 

diff --git a/source3/smbd/error.c b/source3/smbd/error.c
index 6655a6fb082a2368a3781bc36eeb85f880f8f155..5ba751647f15b9d1a69f62d2e5b9d1820b96c9c4 100644 (file)
--- a/source3/smbd/error.c
+++ b/source3/smbd/error.c
@@ -21,9 +21,6 @@
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
 
-/* From lib/error.c */
-extern struct unix_error_map unix_dos_nt_errmap[];
-
 bool use_nt_status(void)
 {
        return lp_nt_status_support() && (global_client_caps & CAP_STATUS32);

diff --git a/source4/libcli/util/errormap.c b/source4/libcli/util/errormap.c
index a0154e370be675804e549d7b786826aefba9ff38..962dc24a45c85d819b673b852facbbf978811c96 100644 (file)
--- a/source4/libcli/util/errormap.c
+++ b/source4/libcli/util/errormap.c
@@ -1259,14 +1259,12 @@ WERROR ntstatus_to_werror(NTSTATUS error)
        return W_ERROR(NT_STATUS_V(error) & 0xffff);
 }
 
-/* Mapping between Unix, DOS and NT error numbers */
+/* Mapping between Unix, and NT error numbers */
 
-struct unix_error_map {
+static const struct {
        int unix_error;
        NTSTATUS nt_error;
-};
-
-const struct unix_error_map unix_nt_errmap[] = {
+} unix_nt_errmap[] = {
        { EAGAIN,       STATUS_MORE_ENTRIES },
        { EINTR,        STATUS_MORE_ENTRIES },
        { ENOBUFS,      STATUS_MORE_ENTRIES },