diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2016-11-30 00:28:31 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2016-11-30 19:44:01 +1100 |
commit | 7fc4766ac78abae81ee75b22b7550720bfa28a33 (patch) | |
tree | 36cc862d4d493587327dc91f89cf96b22e8230ee /misc.h | |
parent | c9f880c195c65f1dddcbc4ce9d6bfea7747debcc (diff) |
upstream commit
On startup, check to see if sshd is already daemonized
and if so, skip the call to daemon() and do not rewrite the PidFile. This
means that when sshd re-execs itself on SIGHUP the process ID will no longer
change. Should address bz#2641. ok djm@ markus@.
Upstream-ID: 5ea0355580056fb3b25c1fd6364307d9638a37b9
Diffstat (limited to 'misc.h')
-rw-r--r-- | misc.h | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: misc.h,v 1.60 2016/10/23 22:04:05 dtucker Exp $ */ +/* $OpenBSD: misc.h,v 1.61 2016/11/30 00:28:31 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -31,6 +31,7 @@ struct Forward { int forward_equals(const struct Forward *, const struct Forward *); int bind_permitted(int, uid_t); +int daemonized(void); /* Common server and client forwarding options. */ struct ForwardOptions { |