summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-08-27 04:11:55 +1000
committerDamien Miller <djm@mindrot.org>2014-08-27 04:11:55 +1000
commit146218ac11a1eb0dcade6f793d7acdef163b5ddc (patch)
tree12ce651173bcc56b6ebc7ac3caf4c9fb9a56f2ab
parent1b215c098b3b37e38aa4e4c91bb908eee41183b1 (diff)
downloadopenssh-git-146218ac11a1eb0dcade6f793d7acdef163b5ddc.tar.gz
- (djm) [monitor.c sshd.c] SIGXFSZ needs to be ignored in postauth
monitor, not preauth; bz#2263
-rw-r--r--ChangeLog2
-rw-r--r--monitor.c3
-rw-r--r--sshd.c4
3 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 17c422c3..378b3881 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
[regress/unittests/sshkey/test_fuzz.c]
[regress/unittests/sshkey/test_sshkey.c] Don't include openssl/ec.h
on !ECC OpenSSL systems
+ - (djm) [monitor.c sshd.c] SIGXFSZ needs to be ignored in postauth
+ monitor, not preauth; bz#2263
20140825
- (djm) [bufec.c] Skip this file on !ECC OpenSSL
diff --git a/monitor.c b/monitor.c
index 72d71c4d..dbe29f12 100644
--- a/monitor.c
+++ b/monitor.c
@@ -471,6 +471,9 @@ monitor_child_postauth(struct monitor *pmonitor)
signal(SIGHUP, &monitor_child_handler);
signal(SIGTERM, &monitor_child_handler);
signal(SIGINT, &monitor_child_handler);
+#ifdef SIGXFSZ
+ signal(SIGXFSZ, SIG_IGN);
+#endif
if (compat20) {
mon_dispatch = mon_dispatch_postauth20;
diff --git a/sshd.c b/sshd.c
index 834240d3..481d0015 100644
--- a/sshd.c
+++ b/sshd.c
@@ -647,10 +647,6 @@ privsep_preauth_child(void)
fatal("setgroups: %.100s", strerror(errno));
permanently_set_uid(privsep_pw);
#endif
-
-#ifdef SIGXFSZ
- signal(SIGXFSZ, SIG_IGN);
-#endif
}
static int