summaryrefslogtreecommitdiff
path: root/debian/patches/systemd-readiness.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/systemd-readiness.patch')
-rw-r--r--debian/patches/systemd-readiness.patch22
1 files changed, 11 insertions, 11 deletions
diff --git a/debian/patches/systemd-readiness.patch b/debian/patches/systemd-readiness.patch
index bbe3b2cd5..24d186ee5 100644
--- a/debian/patches/systemd-readiness.patch
+++ b/debian/patches/systemd-readiness.patch
@@ -1,11 +1,11 @@
1From 818791ef8edf087481bd49eb32335c8d7e1953d6 Mon Sep 17 00:00:00 2001 1From 91be8a1c1f0387c154ac839c54f8fdfbe2d3c3c5 Mon Sep 17 00:00:00 2001
2From: Michael Biebl <biebl@debian.org> 2From: Michael Biebl <biebl@debian.org>
3Date: Mon, 21 Dec 2015 16:08:47 +0000 3Date: Mon, 21 Dec 2015 16:08:47 +0000
4Subject: Add systemd readiness notification support 4Subject: Add systemd readiness notification support
5 5
6Bug-Debian: https://bugs.debian.org/778913 6Bug-Debian: https://bugs.debian.org/778913
7Forwarded: no 7Forwarded: no
8Last-Update: 2015-12-21 8Last-Update: 2016-01-04
9 9
10Patch-Name: systemd-readiness.patch 10Patch-Name: systemd-readiness.patch
11--- 11---
@@ -56,7 +56,7 @@ index 128889a..eec2b72 100644
56 echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG" 56 echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG"
57 echo " BSD Auth support: $BSD_AUTH_MSG" 57 echo " BSD Auth support: $BSD_AUTH_MSG"
58diff --git a/sshd.c b/sshd.c 58diff --git a/sshd.c b/sshd.c
59index 7e72b9b..4d28dc0 100644 59index 7e72b9b..19ee92b 100644
60--- a/sshd.c 60--- a/sshd.c
61+++ b/sshd.c 61+++ b/sshd.c
62@@ -85,6 +85,10 @@ 62@@ -85,6 +85,10 @@
@@ -70,15 +70,15 @@ index 7e72b9b..4d28dc0 100644
70 #include "xmalloc.h" 70 #include "xmalloc.h"
71 #include "ssh.h" 71 #include "ssh.h"
72 #include "ssh1.h" 72 #include "ssh1.h"
73@@ -2011,6 +2015,11 @@ main(int ac, char **av) 73@@ -2052,6 +2056,11 @@ main(int ac, char **av)
74 /* ignore SIGPIPE */ 74 unsetenv("SSH_SIGSTOP");
75 signal(SIGPIPE, SIG_IGN); 75 }
76 76
77+#ifdef HAVE_SYSTEMD 77+#ifdef HAVE_SYSTEMD
78+ /* Signal systemd that we are ready to accept connections */ 78+ /* Signal systemd that we are ready to accept connections */
79+ sd_notify(0, "READY=1"); 79+ sd_notify(0, "READY=1");
80+#endif 80+#endif
81+ 81+
82 /* Get a connection, either from inetd or a listening TCP socket */ 82 /* Accept a connection and return in a forked child */
83 if (inetd_flag) { 83 server_accept_loop(&sock_in, &sock_out,
84 server_accept_inetd(&sock_in, &sock_out); 84 &newsock, config_s);