- deraadt@cvs.openbsd.org 2006/08/18 09:13:26

     [log.c log.h sshd.c]
     make signal handler termination path shorter; risky code pointed out by
     mark dowd; ok djm markus

1 files changed, 2 insertions, 4 deletions

diff --git a/sshd.c b/sshd.c
index 7065d471b..f1f2e38b3 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.345 2006/08/16 11:47:15 djm Exp $ */
+/* $OpenBSD: sshd.c,v 1.346 2006/08/18 09:13:26 deraadt Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -344,13 +344,11 @@ main_sigchld_handler(int sig)
 static void
 grace_alarm_handler(int sig)
 {
-        /* XXX no idea how fix this signal handler */
-
         if (use_privsep && pmonitor != NULL && pmonitor->m_pid > 0)
                 kill(pmonitor->m_pid, SIGALRM);
 
         /* Log error and exit. */
-        fatal("Timeout before authentication for %s", get_remote_ipaddr());
+        sigdie("Timeout before authentication for %s", get_remote_ipaddr());
 }
 
 /*