Never signal the service supervisor with SIGSTOP more than once, to

prevent a hang on re-exec (thanks, Robie Basak; LP: #1306877).

1 files changed, 14 insertions, 7 deletions

diff --git a/debian/patches/sigstop.patch b/debian/patches/sigstop.patch
index 91c9d5434..6a15e0dc5 100644
--- a/debian/patches/sigstop.patch
+++ b/debian/patches/sigstop.patch
@@ -1,27 +1,34 @@
-From d9ac4d127f53d92cf3426fba28ff351e5e165ae2 Mon Sep 17 00:00:00 2001
+From cfeaa0ba2ce2859573f7e980be09ef05511f56a2 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Sun, 9 Feb 2014 16:10:17 +0000
 Subject: Support synchronisation with service supervisor using SIGSTOP
 
+Author: Robie Basak <robie.basak@ubuntu.com>
 Forwarded: no
-Last-Update: 2013-09-14
+Last-Update: 2014-04-14
 
 Patch-Name: sigstop.patch
 ---
- sshd.c |    4 ++++
- 1 file changed, 4 insertions(+)
+ sshd.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
 
 diff --git a/sshd.c b/sshd.c
-index 665c0b9..ffe360c 100644
+index 665c0b9..0964491 100644
 --- a/sshd.c
 +++ b/sshd.c
-@@ -1931,6 +1931,10 @@ main(int ac, char **av)
+@@ -1931,6 +1931,16 @@ main(int ac, char **av)
                         }
                 }
  
-+               if (getenv("SSH_SIGSTOP"))
++               if (getenv("SSH_SIGSTOP")) {
 +                       /* Tell service supervisor that we are ready. */
 +                       kill(getpid(), SIGSTOP);
++                       /* The service supervisor only ever expects a single
++                        * STOP signal, so do not ever signal it again, even
++                        * in the case of a re-exec or future children.
++                        */
++                       unsetenv("SSH_SIGSTOP");
++               }
 +
                 /* Accept a connection and return in a forked child */
                 server_accept_loop(&sock_in, &sock_out,