Attachment 664 Details for Bug 863 – set flag to prevent double-error

[patch] set flag to prevent double-error

openssh-scp-double-error.patch (text/plain), 1.06 KB, created by Darren Tucker on 2004-06-25 19:42:05 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2004-06-25 19:42:05 AEST

Size: 1.06 KB

patch

obsolete

>Index: scp.c
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/scp.c,v
>retrieving revision 1.127
>diff -u -p -r1.127 scp.c
>--- scp.c	22 Jun 2004 02:56:02 -0000	1.127
>+++ scp.c	25 Jun 2004 09:39:01 -0000
>@@ -946,21 +946,25 @@ bad:			run_err("%s: %s", np, strerror(er
> 		if (pflag) {
> 			if (exists || omode != mode)
> #ifdef HAVE_FCHMOD
>-				if (fchmod(ofd, omode))
>+				if (fchmod(ofd, omode)) {
> #else /* HAVE_FCHMOD */
>-				if (chmod(np, omode))
>+				if (chmod(np, omode)) {
> #endif /* HAVE_FCHMOD */
> 					run_err("%s: set mode: %s",
> 					    np, strerror(errno));
>+					wrerr = DISPLAYED;
>+				}
> 		} else {
> 			if (!exists && omode != mode)
> #ifdef HAVE_FCHMOD
>-				if (fchmod(ofd, omode & ~mask))
>+				if (fchmod(ofd, omode & ~mask)) {
> #else /* HAVE_FCHMOD */
>-				if (chmod(np, omode & ~mask))
>+				if (chmod(np, omode & ~mask)) {
> #endif /* HAVE_FCHMOD */
> 					run_err("%s: set mode: %s",
> 					    np, strerror(errno));
>+					wrerr = DISPLAYED;
>+				}
> 		}
> 		if (close(ofd) == -1) {
> 			wrerr = YES;

Actions: View | Diff

Attachments on bug 863: 664 | 669 | 670