Attachment 1305 Details for Bug 1262 – Better error message

[patch] Better error message

mux-hostname-on-close.diff (text/plain), 2.24 KB, created by Damien Miller on 2007-06-12 21:35:19 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2007-06-12 21:35:19 AEST

Size: 2.24 KB

patch

obsolete

>? scard/Ssh.bin
>? scp/scp
>? scp/scp.cat1
>? sftp/sftp
>? sftp/sftp.cat1
>? sftp-server/sftp-server
>? sftp-server/sftp-server.cat8
>? ssh/ssh
>? ssh/ssh.cat1
>? ssh/ssh_config.cat5
>? ssh-add/ssh-add
>? ssh-add/ssh-add.cat1
>? ssh-agent/ssh-agent
>? ssh-agent/ssh-agent.cat1
>? ssh-keygen/ssh-keygen
>? ssh-keygen/ssh-keygen.cat1
>? ssh-keyscan/ssh-keyscan
>? ssh-keyscan/ssh-keyscan.cat1
>? ssh-keysign/ssh-keysign
>? ssh-keysign/ssh-keysign.cat8
>? sshd/sshd
>? sshd/sshd.cat8
>? sshd/sshd_config.cat5
>Index: Makefile.inc
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/Makefile.inc,v
>retrieving revision 1.30
>diff -u -p -r1.30 Makefile.inc
>--- Makefile.inc	17 Jun 2005 02:45:19 -0000	1.30
>+++ Makefile.inc	12 Jun 2007 11:34:29 -0000
>@@ -3,7 +3,7 @@
> CFLAGS+=	-I${.CURDIR}/..
> 
> CDIAGFLAGS=	-Wall
>-#CDIAGFLAGS+=	-Werror
>+CDIAGFLAGS+=	-Werror
> CDIAGFLAGS+=	-Wpointer-arith
> CDIAGFLAGS+=	-Wno-uninitialized
> CDIAGFLAGS+=	-Wstrict-prototypes
>@@ -13,7 +13,7 @@ CDIAGFLAGS+=	-Wsign-compare
> CDIAGFLAGS+=	-Wbounded
> CDIAGFLAGS+=	-Wshadow
> 
>-#DEBUG=-g
>+DEBUG=-g
> 
> #CFLAGS+=	-DSMARTCARD
> #LDADD+=	-lsectok
>Index: scp.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/scp.c,v
>retrieving revision 1.157
>diff -u -p -r1.157 scp.c
>--- scp.c	12 Jun 2007 08:24:20 -0000	1.157
>+++ scp.c	12 Jun 2007 11:34:29 -0000
>@@ -1009,7 +1009,8 @@ bad:			run_err("%s: %s", np, strerror(er
> 			wrerr = YES;
> 			wrerrno = errno;
> 		}
>-		if (wrerr == NO && ftruncate(ofd, size) != 0) {
>+		if (wrerr == NO && (!exists || S_ISREG(stb.st_mode)) &&
>+		    ftruncate(ofd, size) != 0) {
> 			run_err("%s: truncate: %s", np, strerror(errno));
> 			wrerr = DISPLAYED;
> 		}
>Index: ssh.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/ssh.c,v
>retrieving revision 1.297
>diff -u -p -r1.297 ssh.c
>--- ssh.c	12 Jun 2007 11:15:17 -0000	1.297
>+++ ssh.c	12 Jun 2007 11:34:29 -0000
>@@ -1460,7 +1460,8 @@ control_client(const char *path)
> 		debug2("Received exit status from master %d", exitval);
> 
> 	if (tty_flag && options.log_level != SYSLOG_LEVEL_QUIET)
>-		fprintf(stderr, "Connection to master closed.\r\n");
>+		fprintf(stderr, "Shared connection to %s closed.\r\n",
>+		    host);
> 
> 	exit(exitval);
> }

Flags:

dtucker: ok+

Actions: View | Diff

Attachments on bug 1262: 1305