tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-31 01:35:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2011/04/12 05:32:49

Browse Source 
[sshd.c]
     exit with 0 status on SIGTERM; bz#1879
This commit is contained in:
Damien Miller 2011-05-05 14:15:09 +10:00
parent 884b63a061
commit 26b57ce6c2
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -46,6 +46,9 @@
- djm@cvs.openbsd.org 2011/04/12 04:23:50 - djm@cvs.openbsd.org 2011/04/12 04:23:50
[ssh-keygen.c] [ssh-keygen.c]
fix -Wshadow fix -Wshadow
- djm@cvs.openbsd.org 2011/04/12 05:32:49
[sshd.c]
exit with 0 status on SIGTERM; bz#1879
20110221 20110221
- (dtucker) [contrib/cygwin/ssh-host-config] From Corinna: revamp of the - (dtucker) [contrib/cygwin/ssh-host-config] From Corinna: revamp of the

4
sshd.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sshd.c,v 1.381 2011/01/11 06:13:10 djm Exp $ */ /* $OpenBSD: sshd.c,v 1.382 2011/04/12 05:32:49 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -1115,7 +1115,7 @@ server_accept_loop(int *sock_in, int *sock_out, int *newsock, int *config_s)
(int) received_sigterm); (int) received_sigterm);
close_listen_socks(); close_listen_socks();
unlink(options.pid_file); unlink(options.pid_file);
exit(255); exit(received_sigterm == SIGTERM ? 0 : 255);
} }
if (key_used && key_do_regen) { if (key_used && key_do_regen) {
generate_ephemeral_server_key(); generate_ephemeral_server_key();