1 files changed, 16 insertions, 1 deletions

diff --git a/sftp.c b/sftp.c
index 1b5c92498..af6e3a69a 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.176 2016/09/12 01:22:38 deraadt Exp $ */
+/* $OpenBSD: sftp.c,v 1.177 2016/10/18 12:41:22 millert Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -232,6 +232,18 @@ killchild(int signo)
 
 /* ARGSUSED */
 static void
+suspchild(int signo)
+{
+        if (sshpid > 1) {
+                kill(sshpid, signo);
+                while (waitpid(sshpid, NULL, WUNTRACED) == -1 && errno == EINTR)
+                        continue;
+        }
+        kill(getpid(), SIGSTOP);
+}
+
+/* ARGSUSED */
+static void
 cmd_interrupt(int signo)
 {
         const char msg[] = "\rInterrupt  \n";
@@ -2213,6 +2225,9 @@ connect_to_server(char *path, char **args, int *in, int *out)
         signal(SIGTERM, killchild);
         signal(SIGINT, killchild);
         signal(SIGHUP, killchild);
+        signal(SIGTSTP, suspchild);
+        signal(SIGTTIN, suspchild);
+        signal(SIGTTOU, suspchild);
         close(c_in);
         close(c_out);
 }