summaryrefslogtreecommitdiff
path: root/mux.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2015-10-15 23:51:40 +0000
committerDamien Miller <djm@mindrot.org>2015-10-16 10:54:08 +1100
commitb1d38a3cc6fe349feb8d16a5f520ef12d1de7cb2 (patch)
treea582897745d044077ea475859be73d0f5ab2158b /mux.c
parent1a2663a15d356bb188196b6414b4c50dc12fd42b (diff)
upstream commit
fix some signed/unsigned integer type mismatches in format strings; reported by Nicholas Lemonias Upstream-ID: 78cd55420a0eef68c4095bdfddd1af84afe5f95c
Diffstat (limited to 'mux.c')
-rw-r--r--mux.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mux.c b/mux.c
index e6136fd28..d8e416262 100644
--- a/mux.c
+++ b/mux.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: mux.c,v 1.54 2015/08/19 23:18:26 djm Exp $ */ 1/* $OpenBSD: mux.c,v 1.55 2015/10/15 23:51:40 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> 3 * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
4 * 4 *
@@ -1744,7 +1744,7 @@ mux_client_forward(int fd, int cancel_flag, u_int ftype, struct Forward *fwd)
1744 fwd->connect_host ? fwd->connect_host : "", 1744 fwd->connect_host ? fwd->connect_host : "",
1745 fwd->connect_port); 1745 fwd->connect_port);
1746 if (muxclient_command == SSHMUX_COMMAND_FORWARD) 1746 if (muxclient_command == SSHMUX_COMMAND_FORWARD)
1747 fprintf(stdout, "%u\n", fwd->allocated_port); 1747 fprintf(stdout, "%i\n", fwd->allocated_port);
1748 break; 1748 break;
1749 case MUX_S_PERMISSION_DENIED: 1749 case MUX_S_PERMISSION_DENIED:
1750 e = buffer_get_string(&m, NULL); 1750 e = buffer_get_string(&m, NULL);
@@ -2169,7 +2169,7 @@ muxclient(const char *path)
2169 case SSHMUX_COMMAND_ALIVE_CHECK: 2169 case SSHMUX_COMMAND_ALIVE_CHECK:
2170 if ((pid = mux_client_request_alive(sock)) == 0) 2170 if ((pid = mux_client_request_alive(sock)) == 0)
2171 fatal("%s: master alive check failed", __func__); 2171 fatal("%s: master alive check failed", __func__);
2172 fprintf(stderr, "Master running (pid=%d)\r\n", pid); 2172 fprintf(stderr, "Master running (pid=%u)\r\n", pid);
2173 exit(0); 2173 exit(0);
2174 case SSHMUX_COMMAND_TERMINATE: 2174 case SSHMUX_COMMAND_TERMINATE:
2175 mux_client_request_terminate(sock); 2175 mux_client_request_terminate(sock);