Attachment 860 Details for Bug 1007 – sftp wait() changeset from 4.0

[patch] sftp wait() changeset from 4.0

openssh-sftp-sigchld.patch (text/plain), 1.27 KB, created by Darren Tucker on 2005-03-30 20:27:48 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2005-03-30 20:27:48 AEST

Size: 1.27 KB

patch

obsolete

>---------------------
>PatchSet 4217 
>Date: 2005/01/24 11:57:40
>Author: dtucker
>Branch: HEAD
>Tag: (none) 
>Log:
>   - dtucker@cvs.openbsd.org 2005/01/24 10:22:06
>     [scp.c sftp.c]
>     Have scp and sftp wait for the spawned ssh to exit before they exit
>     themselves.  This prevents ssh from being unable to restore terminal
>     modes (not normally a problem on OpenBSD but common with -Portable
>     on POSIX platforms).  From peak at argo.troja.mff.cuni.cz (bz#950);
>     ok djm@ markus@
>
>Members: 
>	ChangeLog:1.3623->1.3624 
>	scp.c:1.131->1.132 
>	sftp.c:1.62->1.63 
>
>Index: openssh_cvs/scp.c
>diff -u openssh_cvs/scp.c:1.131 openssh_cvs/scp.c:1.132
>--- openssh_cvs/scp.c:1.131	Fri Nov  5 20:10:02 2004
>+++ openssh_cvs/scp.c	Mon Jan 24 21:57:40 2005
>@@ -108,8 +108,10 @@
> static void
> killchild(int signo)
> {
>-	if (do_cmd_pid > 1)
>+	if (do_cmd_pid > 1) {
> 		kill(do_cmd_pid, signo);
>+		waitpid(do_cmd_pid, NULL, 0);
>+	}
> 
> 	_exit(1);
> }
>Index: openssh_cvs/sftp.c
>diff -u openssh_cvs/sftp.c:1.62 openssh_cvs/sftp.c:1.63
>--- openssh_cvs/sftp.c:1.62	Sat Dec 11 13:37:22 2004
>+++ openssh_cvs/sftp.c	Mon Jan 24 21:57:40 2005
>@@ -150,8 +150,10 @@
> static void
> killchild(int signo)
> {
>-	if (sshpid > 1)
>+	if (sshpid > 1) {
> 		kill(sshpid, SIGTERM);
>+		waitpid(sshpid, NULL, 0);
>+	}
> 
> 	_exit(1);
> }

Actions: View | Diff

Attachments on bug 1007: 859 | 860 | 869 | 1431