diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2011-04-12 05:32:50 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2011-04-12 05:32:50 +0000 |
| commit | 5e3cd7eb88849296448b34241253e98e1b04d099 (patch) | |
| tree | a5e9dba7754b1bb27b0e446ae0802a868f4e2d8a /usr.bin/ssh | |
| parent | 2184ceb20ca2196c15e8ab328ce8c02bc6a22ba4 (diff) | |
exit with 0 status on SIGTERM; bz#1879
Diffstat (limited to 'usr.bin/ssh')
| -rw-r--r-- | usr.bin/ssh/sshd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c index 2e783d3c4ed..2b2f130aaa6 100644 --- a/usr.bin/ssh/sshd.c +++ b/usr.bin/ssh/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 @@ -1084,7 +1084,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(); |