diff options
| author | djm <djm> | 2006-08-18 14:32:20 +0000 |
|---|---|---|
| committer | djm <djm> | 2006-08-18 14:32:20 +0000 |
| commit | 986acef8640919e7dde650907a54f393c9d38dde (patch) | |
| tree | e153849f7d00663aa563175dd1f9c430c0a48eac /sshd.c | |
| parent | 5cb1415ff137745a2083abfd6650c999125d668f (diff) | |
| download | openssh-986acef8640919e7dde650907a54f393c9d38dde.tar.gz | |
- 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
Diffstat (limited to 'sshd.c')
| -rw-r--r-- | sshd.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -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()); } /* |