upstream commit

Use strsignal in debug message instead of casting for the
benefit of portable where sig_atomic_t might not be int.  "much nicer"
deraadt@

Upstream-ID: 2dac6c1e40511c700bd90664cd263ed2299dcf79

diff --git a/mux.c b/mux.c
index ad0b7a23035c7f0101373cdd835a7d5fd8080c29..5ae4544100e2fb5cb95560ce033ec8e2d35ac2f2 100644 (file)
--- a/mux.c
+++ b/mux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mux.c,v 1.68 2017/09/18 12:03:24 dtucker Exp $ */
+/* $OpenBSD: mux.c,v 1.69 2017/09/20 05:19:00 dtucker Exp $ */
 /*
  * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
  *
@@ -2001,7 +2001,7 @@ mux_client_request_session(int fd)
                leave_raw_mode(options.request_tty == REQUEST_TTY_FORCE);
 
        if (muxclient_terminate) {
-               debug2("Exiting on signal %ld", (long)muxclient_terminate);
+               debug2("Exiting on signal: %s", strsignal(muxclient_terminate));
                exitval = 255;
        } else if (!exitval_seen) {
                debug2("Control master terminated unexpectedly");