Spelling.

[nivanova/samba-autobuild/.git] / source3 / libsmb / clierror.c

diff --git a/source3/libsmb/clierror.c b/source3/libsmb/clierror.c
index 12a7b5dba180c73cfac0909a306fb0e7dfcd3f82..656671823c40ead3257da7af4c55321d69a84a6d 100644 (file)
--- a/source3/libsmb/clierror.c
+++ b/source3/libsmb/clierror.c
@@ -2,6 +2,7 @@
    Unix SMB/CIFS implementation.
    client error handling routines
    Copyright (C) Andrew Tridgell 1994-1998
+   Copyright (C) Jelmer Vernooij 2003
    
    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
@@ -95,17 +96,21 @@ const char *cli_errstr(struct cli_state *cli)
                                break;
                        case READ_EOF:
                                slprintf(cli_error_message, sizeof(cli_error_message) - 1,
-                                       "Call returned zero bytes (EOF)\n" );
+                                       "Call returned zero bytes (EOF)" );
                                break;
                        case READ_ERROR:
                                slprintf(cli_error_message, sizeof(cli_error_message) - 1,
-                                       "Read error: %s\n", strerror(errno) );
+                                       "Read error: %s", strerror(errno) );
                                break;
                        case WRITE_ERROR:
                                slprintf(cli_error_message, sizeof(cli_error_message) - 1,
-                                       "Write error: %s\n", strerror(errno) );
+                                       "Write error: %s", strerror(errno) );
                                break;
-                       default:
+                       case READ_BAD_SIG:
+                               slprintf(cli_error_message, sizeof(cli_error_message) - 1,
+                                       "Server packet had invalid SMB signature!");
+                               break;
+                       default:
                                slprintf(cli_error_message, sizeof(cli_error_message) - 1,
                                        "Unknown error code %d\n", cli->smb_rw_error );
                                break;
@@ -220,16 +225,104 @@ static struct {
        int error;
 } nt_errno_map[] = {
         {NT_STATUS_ACCESS_VIOLATION, EACCES},
-        {NT_STATUS_NO_SUCH_FILE, ENOENT},
-        {NT_STATUS_NO_SUCH_DEVICE, ENODEV},
         {NT_STATUS_INVALID_HANDLE, EBADF},
-        {NT_STATUS_NO_MEMORY, ENOMEM},
         {NT_STATUS_ACCESS_DENIED, EACCES},
         {NT_STATUS_OBJECT_NAME_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 ECOMM
+       {NT_STATUS_NET_WRITE_FAULT, ECOMM},
+#endif
+
        {NT_STATUS(0), 0}
 };