X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=source3%2Flibsmb%2Fclierror.c;h=656671823c40ead3257da7af4c55321d69a84a6d;hb=aed434ea9baf430bf7513ca3fb1f7b2f01792341;hp=4f80f274d98ddb15fd764f3870580501e92ede38;hpb=38794e945effa1b0626642ea1a80b74d9cf7e8f2;p=nivanova%2Fsamba-autobuild%2F.git

diff --git a/source3/libsmb/clierror.c b/source3/libsmb/clierror.c
index 4f80f274d98..656671823c4 100644
--- a/source3/libsmb/clierror.c
+++ b/source3/libsmb/clierror.c
@@ -96,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;
@@ -231,7 +235,13 @@ static struct {
 	{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
@@ -252,7 +262,6 @@ static struct {
 	{NT_STATUS_UNABLE_TO_FREE_VM, EADDRINUSE},
 	{NT_STATUS_ACCESS_DENIED, EACCES}, 
 	{NT_STATUS_BUFFER_TOO_SMALL, ENOBUFS},
-	{NT_STATUS_QUOTA_EXCEEDED, EDQUOT},
 	{NT_STATUS_WRONG_PASSWORD, EACCES},
 	{NT_STATUS_LOGON_FAILURE, EACCES},
 	{NT_STATUS_INVALID_WORKSTATION, EACCES},
@@ -272,8 +281,6 @@ static struct {
 	{NT_STATUS_HOST_UNREACHABLE, EHOSTUNREACH},
 	{NT_STATUS_CONNECTION_ABORTED, ECONNABORTED},
 	{NT_STATUS_CONNECTION_REFUSED, ECONNREFUSED},
-	{NT_STATUS_REGISTRY_QUOTA_LIMIT, EDQUOT},
-	{NT_STATUS_LICENSE_QUOTA_EXCEEDED, EDQUOT},
 	{NT_STATUS_TOO_MANY_LINKS, EMLINK},
 	{NT_STATUS_NETWORK_BUSY, EBUSY},
 	{NT_STATUS_DEVICE_DOES_NOT_EXIST, ENODEV},