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 @@
    - djm@cvs.openbsd.org 2011/04/12 04:23:50
      [ssh-keygen.c]
      fix -Wshadow
+   - djm@cvs.openbsd.org 2011/04/12 05:32:49
+     [sshd.c]
+     exit with 0 status on SIGTERM; bz#1879
 
 20110221
  - (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 @@
-/* $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();