commit 26b57ce6c24f243790e6b19659caf9a4e41a8afe
author Damien Miller <djm@mindrot.org> Thu May 05 14:15:09 2011 +1000
committer Damien Miller <djm@mindrot.org> Thu May 05 14:15:09 2011 +1000
tree 0b243572664cca0faf2e6c65c9754b08dbe5ea02
parent 884b63a061dbaf750b6c95043358d6a6b87fdf7a

   - djm@cvs.openbsd.org 2011/04/12 05:32:49
     [sshd.c]
     exit with 0 status on SIGTERM; bz#1879

sshd.c

diff --git a/sshd.c b/sshd.c
index 8f65858..50d0ded 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 @@
 			    (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();