* New upstream release (http://www.openssh.com/txt/release-5.6):

  - Added a ControlPersist option to ssh_config(5) that automatically
    starts a background ssh(1) multiplex master when connecting.  This
    connection can stay alive indefinitely, or can be set to automatically
    close after a user-specified duration of inactivity (closes: #335697,
    #350898, #454787, #500573, #550262).
  - Support AuthorizedKeysFile, AuthorizedPrincipalsFile,
    HostbasedUsesNameFromPacketOnly, and PermitTunnel in sshd_config(5)
    Match blocks (closes: #549858).
  - sftp(1): fix ls in working directories that contain globbing
    characters in their pathnames (LP: #530714).

1 files changed, 19 insertions, 1 deletions

diff --git a/scp.c b/scp.c
index 0b483df99..b28d75eba 100644
--- a/scp.c
+++ b/scp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scp.c,v 1.165 2009/12/20 07:28:36 guenther Exp $ */
+/* $OpenBSD: scp.c,v 1.166 2010/07/01 13:06:59 millert Exp $ */
 /*
  * scp - secure remote copy.  This is basically patched BSD rcp which
  * uses ssh to do the data transfer (instead of using rcmd).
@@ -156,6 +156,20 @@ killchild(int signo)
         exit(1);
 }
 
+static void
+suspchild(int signo)
+{
+        int status;
+
+        if (do_cmd_pid > 1) {
+                kill(do_cmd_pid, signo);
+                while (waitpid(do_cmd_pid, &status, WUNTRACED) == -1 &&
+                    errno == EINTR)
+                        ;
+                kill(getpid(), SIGSTOP);
+        }
+}
+
 static int
 do_local_cmd(arglist *a)
 {
@@ -240,6 +254,10 @@ do_cmd(char *host, char *remuser, char *cmd, int *fdin, int *fdout)
         close(reserved[0]);
         close(reserved[1]);
 
+        signal(SIGTSTP, suspchild);
+        signal(SIGTTIN, suspchild);
+        signal(SIGTTOU, suspchild);
+
         /* Fork a child to execute the command on the remote host using ssh. */
         do_cmd_pid = fork();
         if (do_cmd_pid == 0) {