Clean up error messages on cli pipe disconnection, including adding the message

for broken-due-to-bad-sig.

Andrew Bartlett
(This used to be commit b010b6c2dc400a97eb2ad038cd1fdb34bbde2ef0)

diff --git a/source3/libsmb/clierror.c b/source3/libsmb/clierror.c
index cea736ef1806648ad9a1099aee5952baca7e93c8..9ee181a90f987983cdaeef55d26828d7ea1a8dfd 100644 (file)
--- 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 signiture!");
+                               break;
+                       default:
                                slprintf(cli_error_message, sizeof(cli_error_message) - 1,
                                        "Unknown error code %d\n", cli->smb_rw_error );
                                break;