summaryrefslogtreecommitdiffstats
path: root/sshd.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2011-05-05 06:15:09 +0200
committerDamien Miller <djm@mindrot.org>2011-05-05 06:15:09 +0200
commit26b57ce6c24f243790e6b19659caf9a4e41a8afe (patch)
tree0b243572664cca0faf2e6c65c9754b08dbe5ea02 /sshd.c
parent - djm@cvs.openbsd.org 2011/04/12 04:23:50 (diff)
downloadopenssh-26b57ce6c24f243790e6b19659caf9a4e41a8afe.tar.xz
openssh-26b57ce6c24f243790e6b19659caf9a4e41a8afe.zip
- djm@cvs.openbsd.org 2011/04/12 05:32:49
[sshd.c] exit with 0 status on SIGTERM; bz#1879
Diffstat (limited to 'sshd.c')
-rw-r--r--sshd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sshd.c b/sshd.c
index 8f65858c9..50d0dede4 100644
--- a/sshd.c
+++ b/sshd.c
@@ -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>
* 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);
close_listen_socks();
unlink(options.pid_file);
- exit(255);
+ exit(received_sigterm == SIGTERM ? 0 : 255);
}
if (key_used && key_do_regen) {
generate_ephemeral_server_key();