2 files changed, 11 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 6a7b4ccb5..f6ec3bd1c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20011205
+ - (bal) OpenBSD CVS Sync
+   - deraadt@cvs.openbsd.org 2001/11/14 20:45:08
+     [sshd.c]
+     errno saving wrapping in a signal handler
+
 20011126
  - (tim) [contrib/cygwin/README, openbsd-compat/bsd-cygwin_util.c,
    openbsd-compat/bsd-cygwin_util.h, openbsd-compat/daemon.c]
@@ -6919,4 +6925,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1666 2001/11/27 01:19:43 tim Exp $
+$Id: ChangeLog,v 1.1667 2001/12/06 16:19:01 mouring Exp $
diff --git a/sshd.c b/sshd.c
index 71a5c2c2e..f81597f1d 100644
--- a/sshd.c
+++ b/sshd.c
@@ -40,7 +40,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.209 2001/11/10 13:19:45 markus Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.210 2001/11/14 20:45:08 deraadt Exp $");
 
 #include <openssl/dh.h>
 #include <openssl/bn.h>
@@ -211,8 +211,11 @@ close_listen_socks(void)
 static void
 sighup_handler(int sig)
 {
+        int save_errno = errno;
+
         received_sighup = 1;
         signal(SIGHUP, sighup_handler);
+        errno = save_errno;
 }
 
 /*