- dtucker@cvs.openbsd.org 2010/01/09 11:17:56
[sshd.c]
Afer sshd receives a SIGHUP, ignore subsequent HUPs while sshd re-execs
itself. Prevents two HUPs in quick succession from resulting in sshd
dying. bz#1692, patch from Colin Watson via Ubuntu.
diff --git a/ChangeLog b/ChangeLog
index 094d1be..47cb97a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,11 @@
Prevent sftp from derefing a null pointer when given a "-" without a
command. Also, allow whitespace to follow a "-". bz#1691, path from
Colin Watson via Debian. ok djm@ deraadt@
+ - dtucker@cvs.openbsd.org 2010/01/09 11:17:56
+ [sshd.c]
+ Afer sshd receives a SIGHUP, ignore subsequent HUPs while sshd re-execs
+ itself. Prevents two HUPs in quick succession from resulting in sshd
+ dying. bz#1692, patch from Colin Watson via Ubuntu.
20091208
- (dtucker) OpenBSD CVS Sync
diff --git a/sshd.c b/sshd.c
index e23d462..bdaf157 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.368 2009/10/28 16:38:18 reyk Exp $ */
+/* $OpenBSD: sshd.c,v 1.369 2010/01/09 11:17:56 dtucker Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -309,6 +309,7 @@
close_listen_socks();
close_startup_pipes();
alarm(0); /* alarm timer persists across exec */
+ signal(SIGHUP, SIG_IGN); /* will be restored after exec */
execv(saved_argv[0], saved_argv);
logit("RESTART FAILED: av[0]='%.100s', error: %.100s.", saved_argv[0],
strerror(errno));