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)
- (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 17c422c32..378b3881c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
6 [regress/unittests/sshkey/test_fuzz.c] 6 [regress/unittests/sshkey/test_fuzz.c]
7 [regress/unittests/sshkey/test_sshkey.c] Don't include openssl/ec.h 7 [regress/unittests/sshkey/test_sshkey.c] Don't include openssl/ec.h
8 on !ECC OpenSSL systems 8 on !ECC OpenSSL systems
9 - (djm) [monitor.c sshd.c] SIGXFSZ needs to be ignored in postauth
10 monitor, not preauth; bz#2263
9 11
1020140825 1220140825
11 - (djm) [bufec.c] Skip this file on !ECC OpenSSL 13 - (djm) [bufec.c] Skip this file on !ECC OpenSSL
diff --git a/monitor.c b/monitor.c
index 72d71c4d3..dbe29f128 100644
--- a/monitor.c
+++ b/monitor.c
@@ -471,6 +471,9 @@ monitor_child_postauth(struct monitor *pmonitor)
471 signal(SIGHUP, &monitor_child_handler); 471 signal(SIGHUP, &monitor_child_handler);
472 signal(SIGTERM, &monitor_child_handler); 472 signal(SIGTERM, &monitor_child_handler);
473 signal(SIGINT, &monitor_child_handler); 473 signal(SIGINT, &monitor_child_handler);
474#ifdef SIGXFSZ
475 signal(SIGXFSZ, SIG_IGN);
476#endif
474 477
475 if (compat20) { 478 if (compat20) {
476 mon_dispatch = mon_dispatch_postauth20; 479 mon_dispatch = mon_dispatch_postauth20;
diff --git a/sshd.c b/sshd.c
index 834240d3c..481d00155 100644
--- a/sshd.c
+++ b/sshd.c
@@ -647,10 +647,6 @@ privsep_preauth_child(void)
647 fatal("setgroups: %.100s", strerror(errno)); 647 fatal("setgroups: %.100s", strerror(errno));
648 permanently_set_uid(privsep_pw); 648 permanently_set_uid(privsep_pw);
649#endif 649#endif
650
651#ifdef SIGXFSZ
652 signal(SIGXFSZ, SIG_IGN);
653#endif
654} 650}
655 651
656static int 652static int