summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2017-09-20 05:19:00 +0000
committerDamien Miller <djm@mindrot.org>2017-09-22 09:14:53 +1000
commit36945fa103176c00b39731e1fc1919a0d0808b81 (patch)
treed864fcee4a6422dea173a116181c70c645b194ed
parent3e8d185af326bf183b6f78597d5e3d2eeb2dc40e (diff)
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
-rw-r--r--mux.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mux.c b/mux.c
index ad0b7a23..5ae45441 100644
--- 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");