diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2008-07-23 09:15:38 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2008-07-23 09:15:38 +0000 |
| commit | 24cf82b14a50efe0bb150e7651f451a3cc36103b (patch) | |
| tree | 31274ced9514914f9504202c6e49c93d509e710d /sshd.c | |
| parent | 024ab8dd1d8c50215dd4a503416b095663d4346c (diff) | |
| download | src-24cf82b14a50efe0bb150e7651f451a3cc36103b.tar.gz src-24cf82b14a50efe0bb150e7651f451a3cc36103b.zip | |
Vendor import of OpenSSH 4.6p1 for posterity's sake
Notes
Notes:
svn path=/vendor-crypto/openssh/dist/; revision=180740
Diffstat (limited to 'sshd.c')
| -rw-r--r-- | sshd.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: sshd.c,v 1.348 2006/11/06 21:25:28 markus Exp $ */ +/* $OpenBSD: sshd.c,v 1.349 2007/02/21 11:00:05 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -305,6 +305,7 @@ sighup_restart(void) logit("Received SIGHUP; restarting."); close_listen_socks(); close_startup_pipes(); + alarm(0); /* alarm timer persists across exec */ execv(saved_argv[0], saved_argv); logit("RESTART FAILED: av[0]='%.100s', error: %.100s.", saved_argv[0], strerror(errno)); |