diff options
| author | Darren Tucker <dtucker@cvs.openbsd.org> | 2016-11-30 00:28:32 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@cvs.openbsd.org> | 2016-11-30 00:28:32 +0000 |
| commit | dfc6a967ed4fc09b172aac40a750e8d50ca1ec93 (patch) | |
| tree | 24b5b524d92d7cb5f26893415774e81d26d7af08 /usr.bin/ssh/misc.h | |
| parent | 564d8093d54b4b2ccb9155fa6aa13cbf89393044 (diff) | |
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@.
Diffstat (limited to 'usr.bin/ssh/misc.h')
| -rw-r--r-- | usr.bin/ssh/misc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/ssh/misc.h b/usr.bin/ssh/misc.h index 45c9ea68a7d..7fe2bd10037 100644 --- a/usr.bin/ssh/misc.h +++ b/usr.bin/ssh/misc.h @@ -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 { |