libcli: Move map_errno_from_nt_status from s3 lib to common libcli

Signed-off-by: Samuel Cabrero <scabrero@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/libcli/util/errmap_unix.c b/libcli/util/errmap_unix.c
index 9ac680919d84936e4ebe613fe2a35bdb67707a46..714fead6efc24b85d05f5b0b90ef4e05016a82b8 100644 (file)
--- a/libcli/util/errmap_unix.c
+++ b/libcli/util/errmap_unix.c
@@ -155,3 +155,143 @@ NTSTATUS map_nt_error_from_unix_common(int unix_error)
        return NT_STATUS_UNSUCCESSFUL;
 }
 
+/* Return a UNIX errno from a NT status code */
+static const struct {
+       NTSTATUS status;
+       int error;
+} nt_errno_map[] = {
+       {NT_STATUS_ACCESS_VIOLATION, EACCES},
+       {NT_STATUS_INVALID_HANDLE, EBADF},
+       {NT_STATUS_ACCESS_DENIED, EACCES},
+       {NT_STATUS_OBJECT_NAME_NOT_FOUND, ENOENT},
+       {NT_STATUS_OBJECT_PATH_NOT_FOUND, ENOENT},
+       {NT_STATUS_SHARING_VIOLATION, EBUSY},
+       {NT_STATUS_OBJECT_PATH_INVALID, ENOTDIR},
+       {NT_STATUS_OBJECT_NAME_COLLISION, EEXIST},
+       {NT_STATUS_PATH_NOT_COVERED, ENOENT},
+       {NT_STATUS_UNSUCCESSFUL, EINVAL},
+       {NT_STATUS_NOT_IMPLEMENTED, ENOSYS},
+       {NT_STATUS_IN_PAGE_ERROR, EFAULT},
+       {NT_STATUS_BAD_NETWORK_NAME, ENOENT},
+#ifdef EDQUOT
+       {NT_STATUS_PAGEFILE_QUOTA, EDQUOT},
+       {NT_STATUS_QUOTA_EXCEEDED, EDQUOT},
+       {NT_STATUS_REGISTRY_QUOTA_LIMIT, EDQUOT},
+       {NT_STATUS_LICENSE_QUOTA_EXCEEDED, EDQUOT},
+#endif
+#ifdef ETIME
+       {NT_STATUS_TIMER_NOT_CANCELED, ETIME},
+#endif
+       {NT_STATUS_INVALID_PARAMETER, EINVAL},
+       {NT_STATUS_NO_SUCH_DEVICE, ENODEV},
+       {NT_STATUS_NO_SUCH_FILE, ENOENT},
+#ifdef ENODATA
+       {NT_STATUS_END_OF_FILE, ENODATA},
+#endif
+#ifdef ENOMEDIUM
+       {NT_STATUS_NO_MEDIA_IN_DEVICE, ENOMEDIUM},
+       {NT_STATUS_NO_MEDIA, ENOMEDIUM},
+#endif
+       {NT_STATUS_NONEXISTENT_SECTOR, ESPIPE},
+       {NT_STATUS_NO_MEMORY, ENOMEM},
+       {NT_STATUS_CONFLICTING_ADDRESSES, EADDRINUSE},
+       {NT_STATUS_NOT_MAPPED_VIEW, EINVAL},
+       {NT_STATUS_UNABLE_TO_FREE_VM, EADDRINUSE},
+       {NT_STATUS_ACCESS_DENIED, EACCES},
+       {NT_STATUS_BUFFER_TOO_SMALL, ENOBUFS},
+       {NT_STATUS_WRONG_PASSWORD, EACCES},
+       {NT_STATUS_LOGON_FAILURE, EACCES},
+       {NT_STATUS_INVALID_WORKSTATION, EACCES},
+       {NT_STATUS_INVALID_LOGON_HOURS, EACCES},
+       {NT_STATUS_PASSWORD_EXPIRED, EACCES},
+       {NT_STATUS_ACCOUNT_DISABLED, EACCES},
+       {NT_STATUS_DISK_FULL, ENOSPC},
+       {NT_STATUS_INVALID_PIPE_STATE, EPIPE},
+       {NT_STATUS_PIPE_BUSY, EPIPE},
+       {NT_STATUS_PIPE_DISCONNECTED, EPIPE},
+       {NT_STATUS_PIPE_NOT_AVAILABLE, ENOSYS},
+       {NT_STATUS_FILE_IS_A_DIRECTORY, EISDIR},
+       {NT_STATUS_NOT_SUPPORTED, ENOSYS},
+       {NT_STATUS_NOT_A_DIRECTORY, ENOTDIR},
+       {NT_STATUS_DIRECTORY_NOT_EMPTY, ENOTEMPTY},
+       {NT_STATUS_NETWORK_UNREACHABLE, ENETUNREACH},
+       {NT_STATUS_HOST_UNREACHABLE, EHOSTUNREACH},
+       {NT_STATUS_CONNECTION_ABORTED, ECONNABORTED},
+       {NT_STATUS_CONNECTION_REFUSED, ECONNREFUSED},
+       {NT_STATUS_TOO_MANY_LINKS, EMLINK},
+       {NT_STATUS_NETWORK_BUSY, EBUSY},
+       {NT_STATUS_DEVICE_DOES_NOT_EXIST, ENODEV},
+#ifdef ELIBACC
+       {NT_STATUS_DLL_NOT_FOUND, ELIBACC},
+#endif
+       {NT_STATUS_PIPE_BROKEN, EPIPE},
+       {NT_STATUS_REMOTE_NOT_LISTENING, ECONNREFUSED},
+       {NT_STATUS_NETWORK_ACCESS_DENIED, EACCES},
+       {NT_STATUS_TOO_MANY_OPENED_FILES, EMFILE},
+#ifdef EPROTO
+       {NT_STATUS_DEVICE_PROTOCOL_ERROR, EPROTO},
+#endif
+       {NT_STATUS_FLOAT_OVERFLOW, ERANGE},
+       {NT_STATUS_FLOAT_UNDERFLOW, ERANGE},
+       {NT_STATUS_INTEGER_OVERFLOW, ERANGE},
+       {NT_STATUS_MEDIA_WRITE_PROTECTED, EROFS},
+       {NT_STATUS_PIPE_CONNECTED, EISCONN},
+       {NT_STATUS_MEMORY_NOT_ALLOCATED, EFAULT},
+       {NT_STATUS_FLOAT_INEXACT_RESULT, ERANGE},
+       {NT_STATUS_ILL_FORMED_PASSWORD, EACCES},
+       {NT_STATUS_PASSWORD_RESTRICTION, EACCES},
+       {NT_STATUS_ACCOUNT_RESTRICTION, EACCES},
+       {NT_STATUS_PORT_CONNECTION_REFUSED, ECONNREFUSED},
+       {NT_STATUS_NAME_TOO_LONG, ENAMETOOLONG},
+       {NT_STATUS_REMOTE_DISCONNECT, ESHUTDOWN},
+       {NT_STATUS_CONNECTION_DISCONNECTED, ECONNABORTED},
+       {NT_STATUS_CONNECTION_RESET, ENETRESET},
+#ifdef ENOTUNIQ
+       {NT_STATUS_IP_ADDRESS_CONFLICT1, ENOTUNIQ},
+       {NT_STATUS_IP_ADDRESS_CONFLICT2, ENOTUNIQ},
+#endif
+       {NT_STATUS_PORT_MESSAGE_TOO_LONG, EMSGSIZE},
+       {NT_STATUS_PROTOCOL_UNREACHABLE, ENOPROTOOPT},
+       {NT_STATUS_ADDRESS_ALREADY_EXISTS, EADDRINUSE},
+       {NT_STATUS_PORT_UNREACHABLE, EHOSTUNREACH},
+       {NT_STATUS_IO_TIMEOUT, ETIMEDOUT},
+       {NT_STATUS_RETRY, EAGAIN},
+#ifdef ENOTUNIQ
+       {NT_STATUS_DUPLICATE_NAME, ENOTUNIQ},
+#endif
+#ifdef ECOMM
+       {NT_STATUS_NET_WRITE_FAULT, ECOMM},
+#endif
+#ifdef EXDEV
+       {NT_STATUS_NOT_SAME_DEVICE, EXDEV},
+#endif
+#ifdef ECANCELED
+       {NT_STATUS_CANCELLED, ECANCELED},
+#endif
+};
+
+/*********************************************************************
+ Map a Unix error code from a NT error code.
+*********************************************************************/
+int map_errno_from_nt_status(NTSTATUS status)
+{
+       size_t i;
+
+       DBG_DEBUG("32 bit codes: code=%08x\n", NT_STATUS_V(status));
+
+       /* Status codes without this bit set are not errors */
+
+       if (!(NT_STATUS_V(status) & 0xc0000000)) {
+               return 0;
+       }
+
+       for (i=0;i<ARRAY_SIZE(nt_errno_map);i++) {
+               if (NT_STATUS_V(nt_errno_map[i].status) ==
+                           NT_STATUS_V(status)) {
+                       return nt_errno_map[i].error;
+               }
+       }
+
+       /* for all other cases - a default code */
+       return EINVAL;
+}

diff --git a/libcli/util/error.h b/libcli/util/error.h
index 1461445847375fec177a7e79b4d087d2de6a4065..3e74e6edf98478999b62520dce797db547407644 100644 (file)
--- a/libcli/util/error.h
+++ b/libcli/util/error.h
@@ -44,6 +44,11 @@ WERROR ntstatus_to_werror(NTSTATUS error);
 *********************************************************************/
 NTSTATUS map_nt_error_from_unix_common(int unix_error);
 
+/*********************************************************************
+ Map a Unix error code from a NT error code.
+*********************************************************************/
+int map_errno_from_nt_status(NTSTATUS status);
+
 NTSTATUS nt_status_squash(NTSTATUS nt_status);
 
 /*****************************************************************************

diff --git a/source3/include/proto.h b/source3/include/proto.h
index d33cccd83903077c5b38c86f3deb2e3ea881003c..4485cb434194a22ac87356aab26bb6e37b48d7c2 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -73,7 +73,6 @@ void display_set_stderr(void);
 /* The following definitions come from lib/errmap_unix.c  */
 
 NTSTATUS map_nt_error_from_unix(int unix_error);
-int map_errno_from_nt_status(NTSTATUS status);
 
 /* The following definitions come from lib/file_id.c  */
 

diff --git a/source3/lib/errmap_unix.c b/source3/lib/errmap_unix.c
index e7cbe2794c5291f0b938ee94c4a92dc1fee68c18..73b2f532a06c6201f88beea6c26b07de5f461b79 100644 (file)
--- a/source3/lib/errmap_unix.c
+++ b/source3/lib/errmap_unix.c
@@ -150,141 +150,3 @@ NTSTATUS map_nt_error_from_unix(int unix_error)
        /* Default return */
        return NT_STATUS_ACCESS_DENIED;
 }
-
-/* Return a UNIX errno from a NT status code */
-static const struct {
-       NTSTATUS status;
-       int error;
-} nt_errno_map[] = {
-        {NT_STATUS_ACCESS_VIOLATION, EACCES},
-        {NT_STATUS_INVALID_HANDLE, EBADF},
-        {NT_STATUS_ACCESS_DENIED, EACCES},
-        {NT_STATUS_OBJECT_NAME_NOT_FOUND, ENOENT},
-        {NT_STATUS_OBJECT_PATH_NOT_FOUND, ENOENT},
-        {NT_STATUS_SHARING_VIOLATION, EBUSY},
-        {NT_STATUS_OBJECT_PATH_INVALID, ENOTDIR},
-        {NT_STATUS_OBJECT_NAME_COLLISION, EEXIST},
-        {NT_STATUS_PATH_NOT_COVERED, ENOENT},
-       {NT_STATUS_UNSUCCESSFUL, EINVAL},
-       {NT_STATUS_NOT_IMPLEMENTED, ENOSYS},
-       {NT_STATUS_IN_PAGE_ERROR, EFAULT}, 
-       {NT_STATUS_BAD_NETWORK_NAME, ENOENT},
-#ifdef EDQUOT
-       {NT_STATUS_PAGEFILE_QUOTA, EDQUOT},
-       {NT_STATUS_QUOTA_EXCEEDED, EDQUOT},
-       {NT_STATUS_REGISTRY_QUOTA_LIMIT, EDQUOT},
-       {NT_STATUS_LICENSE_QUOTA_EXCEEDED, EDQUOT},
-#endif
-#ifdef ETIME
-       {NT_STATUS_TIMER_NOT_CANCELED, ETIME},
-#endif
-       {NT_STATUS_INVALID_PARAMETER, EINVAL},
-       {NT_STATUS_NO_SUCH_DEVICE, ENODEV},
-       {NT_STATUS_NO_SUCH_FILE, ENOENT},
-#ifdef ENODATA
-       {NT_STATUS_END_OF_FILE, ENODATA}, 
-#endif
-#ifdef ENOMEDIUM
-       {NT_STATUS_NO_MEDIA_IN_DEVICE, ENOMEDIUM}, 
-       {NT_STATUS_NO_MEDIA, ENOMEDIUM},
-#endif
-       {NT_STATUS_NONEXISTENT_SECTOR, ESPIPE}, 
-        {NT_STATUS_NO_MEMORY, ENOMEM},
-       {NT_STATUS_CONFLICTING_ADDRESSES, EADDRINUSE},
-       {NT_STATUS_NOT_MAPPED_VIEW, EINVAL},
-       {NT_STATUS_UNABLE_TO_FREE_VM, EADDRINUSE},
-       {NT_STATUS_ACCESS_DENIED, EACCES}, 
-       {NT_STATUS_BUFFER_TOO_SMALL, ENOBUFS},
-       {NT_STATUS_WRONG_PASSWORD, EACCES},
-       {NT_STATUS_LOGON_FAILURE, EACCES},
-       {NT_STATUS_INVALID_WORKSTATION, EACCES},
-       {NT_STATUS_INVALID_LOGON_HOURS, EACCES},
-       {NT_STATUS_PASSWORD_EXPIRED, EACCES},
-       {NT_STATUS_ACCOUNT_DISABLED, EACCES},
-       {NT_STATUS_DISK_FULL, ENOSPC},
-       {NT_STATUS_INVALID_PIPE_STATE, EPIPE},
-       {NT_STATUS_PIPE_BUSY, EPIPE},
-       {NT_STATUS_PIPE_DISCONNECTED, EPIPE},
-       {NT_STATUS_PIPE_NOT_AVAILABLE, ENOSYS},
-       {NT_STATUS_FILE_IS_A_DIRECTORY, EISDIR},
-       {NT_STATUS_NOT_SUPPORTED, ENOSYS},
-       {NT_STATUS_NOT_A_DIRECTORY, ENOTDIR},
-       {NT_STATUS_DIRECTORY_NOT_EMPTY, ENOTEMPTY},
-       {NT_STATUS_NETWORK_UNREACHABLE, ENETUNREACH},
-       {NT_STATUS_HOST_UNREACHABLE, EHOSTUNREACH},
-       {NT_STATUS_CONNECTION_ABORTED, ECONNABORTED},
-       {NT_STATUS_CONNECTION_REFUSED, ECONNREFUSED},
-       {NT_STATUS_TOO_MANY_LINKS, EMLINK},
-       {NT_STATUS_NETWORK_BUSY, EBUSY},
-       {NT_STATUS_DEVICE_DOES_NOT_EXIST, ENODEV},
-#ifdef ELIBACC
-       {NT_STATUS_DLL_NOT_FOUND, ELIBACC},
-#endif
-       {NT_STATUS_PIPE_BROKEN, EPIPE},
-       {NT_STATUS_REMOTE_NOT_LISTENING, ECONNREFUSED},
-       {NT_STATUS_NETWORK_ACCESS_DENIED, EACCES},
-       {NT_STATUS_TOO_MANY_OPENED_FILES, EMFILE},
-#ifdef EPROTO
-       {NT_STATUS_DEVICE_PROTOCOL_ERROR, EPROTO},
-#endif
-       {NT_STATUS_FLOAT_OVERFLOW, ERANGE},
-       {NT_STATUS_FLOAT_UNDERFLOW, ERANGE},
-       {NT_STATUS_INTEGER_OVERFLOW, ERANGE},
-       {NT_STATUS_MEDIA_WRITE_PROTECTED, EROFS},
-       {NT_STATUS_PIPE_CONNECTED, EISCONN},
-       {NT_STATUS_MEMORY_NOT_ALLOCATED, EFAULT},
-       {NT_STATUS_FLOAT_INEXACT_RESULT, ERANGE},
-       {NT_STATUS_ILL_FORMED_PASSWORD, EACCES},
-       {NT_STATUS_PASSWORD_RESTRICTION, EACCES},
-       {NT_STATUS_ACCOUNT_RESTRICTION, EACCES},
-       {NT_STATUS_PORT_CONNECTION_REFUSED, ECONNREFUSED},
-       {NT_STATUS_NAME_TOO_LONG, ENAMETOOLONG},
-       {NT_STATUS_REMOTE_DISCONNECT, ESHUTDOWN},
-       {NT_STATUS_CONNECTION_DISCONNECTED, ECONNABORTED},
-       {NT_STATUS_CONNECTION_RESET, ENETRESET},
-#ifdef ENOTUNIQ
-       {NT_STATUS_IP_ADDRESS_CONFLICT1, ENOTUNIQ},
-       {NT_STATUS_IP_ADDRESS_CONFLICT2, ENOTUNIQ},
-#endif
-       {NT_STATUS_PORT_MESSAGE_TOO_LONG, EMSGSIZE},
-       {NT_STATUS_PROTOCOL_UNREACHABLE, ENOPROTOOPT},
-       {NT_STATUS_ADDRESS_ALREADY_EXISTS, EADDRINUSE},
-       {NT_STATUS_PORT_UNREACHABLE, EHOSTUNREACH},
-       {NT_STATUS_IO_TIMEOUT, ETIMEDOUT},
-       {NT_STATUS_RETRY, EAGAIN},
-#ifdef ENOTUNIQ
-       {NT_STATUS_DUPLICATE_NAME, ENOTUNIQ},
-#endif
-#ifdef ECOMM
-       {NT_STATUS_NET_WRITE_FAULT, ECOMM},
-#endif
-#ifdef EXDEV
-       {NT_STATUS_NOT_SAME_DEVICE, EXDEV},
-#endif
-#ifdef ECANCELED
-       {NT_STATUS_CANCELLED, ECANCELED},
-#endif
-};
-
-int map_errno_from_nt_status(NTSTATUS status)
-{
-       size_t i;
-       DEBUG(10,("map_errno_from_nt_status: 32 bit codes: code=%08x\n",
-               NT_STATUS_V(status)));
-
-       /* Status codes without this bit set are not errors */
-
-       if (!(NT_STATUS_V(status) & 0xc0000000)) {
-               return 0;
-       }
-
-       for (i=0;i<ARRAY_SIZE(nt_errno_map);i++) {
-               if (NT_STATUS_V(nt_errno_map[i].status) ==
-                           NT_STATUS_V(status)) {
-                       return nt_errno_map[i].error;
-               }
-       }
-
-       /* for all other cases - a default code */
-       return EINVAL;
-}

diff --git a/source3/wscript_build b/source3/wscript_build
index d231584a8506de1dce6a1d07535852bfb0317590..56fca6c7544ada5725accbdfffaa21afcee77e68 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -563,7 +563,6 @@ bld.SAMBA3_LIBRARY('smbconf',
                         cap
                         charset
                         samba-hostconfig
-                        errors3
                         SMBCONF_PARAM
                         samba-util
                         talloc