When running under Upstart, only consider the daemon started once it is

ready to accept connections (by raising SIGSTOP at that point and using
"expect stop").

1 files changed, 4 insertions, 0 deletions

diff --git a/sshd.c b/sshd.c
index 64c564236..0c260a50d 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1855,6 +1855,10 @@ main(int ac, char **av)
                         }
                 }
 
+                if (getenv("SSH_SIGSTOP"))
+                        /* Tell service supervisor that we are ready. */
+                        kill(getpid(), SIGSTOP);
+
                 /* Accept a connection and return in a forked child */
                 server_accept_loop(&sock_in, &sock_out,
                     &newsock, config_s);