diff options
author | Michael Biebl <biebl@debian.org> | 2016-01-04 13:35:41 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2016-01-04 13:37:07 +0000 |
commit | f9c35cbf21fa84501c5786923b4d200523977802 (patch) | |
tree | 5b42f83aeba176e6f1f6929216d2f63430d586f5 /sshd.c | |
parent | 51c7fec51ac4936f82187c517f2dd152563828f4 (diff) | |
parent | e95f51a2a4b404bcb04bfdf8d092efb37eef446c (diff) |
Don't call sd_notify when sshd is re-execed (closes: #809035).
Diffstat (limited to 'sshd.c')
-rw-r--r-- | sshd.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -2015,11 +2015,6 @@ main(int ac, char **av) | |||
2015 | /* ignore SIGPIPE */ | 2015 | /* ignore SIGPIPE */ |
2016 | signal(SIGPIPE, SIG_IGN); | 2016 | signal(SIGPIPE, SIG_IGN); |
2017 | 2017 | ||
2018 | #ifdef HAVE_SYSTEMD | ||
2019 | /* Signal systemd that we are ready to accept connections */ | ||
2020 | sd_notify(0, "READY=1"); | ||
2021 | #endif | ||
2022 | |||
2023 | /* Get a connection, either from inetd or a listening TCP socket */ | 2018 | /* Get a connection, either from inetd or a listening TCP socket */ |
2024 | if (inetd_flag) { | 2019 | if (inetd_flag) { |
2025 | server_accept_inetd(&sock_in, &sock_out); | 2020 | server_accept_inetd(&sock_in, &sock_out); |
@@ -2061,6 +2056,11 @@ main(int ac, char **av) | |||
2061 | unsetenv("SSH_SIGSTOP"); | 2056 | unsetenv("SSH_SIGSTOP"); |
2062 | } | 2057 | } |
2063 | 2058 | ||
2059 | #ifdef HAVE_SYSTEMD | ||
2060 | /* Signal systemd that we are ready to accept connections */ | ||
2061 | sd_notify(0, "READY=1"); | ||
2062 | #endif | ||
2063 | |||
2064 | /* Accept a connection and return in a forked child */ | 2064 | /* Accept a connection and return in a forked child */ |
2065 | server_accept_loop(&sock_in, &sock_out, | 2065 | server_accept_loop(&sock_in, &sock_out, |
2066 | &newsock, config_s); | 2066 | &newsock, config_s); |