summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--sshd.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 56bbe8062..fe3bf96db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -46,6 +46,9 @@
46 - djm@cvs.openbsd.org 2011/04/12 04:23:50 46 - djm@cvs.openbsd.org 2011/04/12 04:23:50
47 [ssh-keygen.c] 47 [ssh-keygen.c]
48 fix -Wshadow 48 fix -Wshadow
49 - djm@cvs.openbsd.org 2011/04/12 05:32:49
50 [sshd.c]
51 exit with 0 status on SIGTERM; bz#1879
49 52
5020110221 5320110221
51 - (dtucker) [contrib/cygwin/ssh-host-config] From Corinna: revamp of the 54 - (dtucker) [contrib/cygwin/ssh-host-config] From Corinna: revamp of the
diff --git a/sshd.c b/sshd.c
index 8f65858c9..50d0dede4 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshd.c,v 1.381 2011/01/11 06:13:10 djm Exp $ */ 1/* $OpenBSD: sshd.c,v 1.382 2011/04/12 05:32:49 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * 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)
1115 (int) received_sigterm); 1115 (int) received_sigterm);
1116 close_listen_socks(); 1116 close_listen_socks();
1117 unlink(options.pid_file); 1117 unlink(options.pid_file);
1118 exit(255); 1118 exit(received_sigterm == SIGTERM ? 0 : 255);
1119 } 1119 }
1120 if (key_used && key_do_regen) { 1120 if (key_used && key_do_regen) {
1121 generate_ephemeral_server_key(); 1121 generate_ephemeral_server_key();