0f0e055
diff --git a/ChangeLog b/ChangeLog
0f0e055
index 3887495..a4dc72f 100644
0f0e055
--- a/ChangeLog
0f0e055
+++ b/ChangeLog
0f0e055
@@ -1,3 +1,9 @@
0f0e055
+20140823
0f0e055
+ - (djm) [sshd.c] Ignore SIGXFSZ in preauth monitor child; can explode on
0f0e055
+   lastlog writing on platforms with high UIDs; bz#2263
0f0e055
+ - (djm) [monitor.c sshd.c] SIGXFSZ needs to be ignored in postauth
0f0e055
+   monitor, not preauth; bz#2263
0f0e055
+
0f0e055
 20140703
0f0e055
  - OpenBSD CVS Sync
0f0e055
    - djm@cvs.openbsd.org 2014/07/03 03:34:09
0f0e055
diff --git a/monitor.c b/monitor.c
0f0e055
index bdabe21..5a65114 100644
0f0e055
--- a/monitor.c
0f0e055
+++ b/monitor.c
0f0e055
@@ -501,6 +501,9 @@ monitor_child_postauth(struct monitor *pmonitor)
0f0e055
 	signal(SIGHUP, &monitor_child_handler);
0f0e055
 	signal(SIGTERM, &monitor_child_handler);
0f0e055
 	signal(SIGINT, &monitor_child_handler);
0f0e055
+#ifdef SIGXFSZ
0f0e055
+	signal(SIGXFSZ, SIG_IGN);
0f0e055
+#endif
0f0e055
 
0f0e055
 	if (compat20) {
0f0e055
 		mon_dispatch = mon_dispatch_postauth20;