From: dtucker@openbsd.org <dtucker@openbsd.org>
Date: Mon, 18 Sep 2017 12:03:24 +0000 (+0000)
Subject: upstream commit
X-Git-Tag: V_7_6_P1~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a3839d8d2b89ff1a80cadd4dd654336710de2c9e;p=thirdparty%2Fopenssh-portable.git

upstream commit

Prevent type mismatch warning in debug on platforms where
sig_atomic_t != int.  ok djm@

Upstream-ID: 306e2375eb0364a4c68e48f091739bea4f4892ed
---

diff --git a/mux.c b/mux.c
index f8510426d..ad0b7a230 100644
--- a/mux.c
+++ b/mux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mux.c,v 1.67 2017/09/12 06:35:32 djm Exp $ */
+/* $OpenBSD: mux.c,v 1.68 2017/09/18 12:03:24 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 %d", muxclient_terminate);
+		debug2("Exiting on signal %ld", (long)muxclient_terminate);
 		exitval = 255;
 	} else if (!exitval_seen) {
 		debug2("Control master terminated unexpectedly");