upstream commit

fix some signed/unsigned integer type mismatches in
 format strings; reported by Nicholas Lemonias

Upstream-ID: 78cd55420a0eef68c4095bdfddd1af84afe5f95c

4 files changed, 9 insertions, 9 deletions

diff --git a/channels.c b/channels.c
index a84b487e5..fdd89a5a0 100644
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.347 2015/07/01 02:26:31 djm Exp $ */
+/* $OpenBSD: channels.c,v 1.348 2015/10/15 23:51:40 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -662,7 +662,7 @@ channel_open_message(void)
                 case SSH_CHANNEL_INPUT_DRAINING:
                 case SSH_CHANNEL_OUTPUT_DRAINING:
                         snprintf(buf, sizeof buf,
-                            "  #%d %.300s (t%d r%d i%d/%d o%d/%d fd %d/%d cc %d)\r\n",
+                            "  #%d %.300s (t%d r%d i%u/%d o%u/%d fd %d/%d cc %d)\r\n",
                             c->self, c->remote_name,
                             c->type, c->remote_id,
                             c->istate, buffer_len(&c->input),
diff --git a/mux.c b/mux.c
index e6136fd28..d8e416262 100644
--- a/mux.c
+++ b/mux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mux.c,v 1.54 2015/08/19 23:18:26 djm Exp $ */
+/* $OpenBSD: mux.c,v 1.55 2015/10/15 23:51:40 djm Exp $ */
 /*
  * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
  *
@@ -1744,7 +1744,7 @@ mux_client_forward(int fd, int cancel_flag, u_int ftype, struct Forward *fwd)
                     fwd->connect_host ? fwd->connect_host : "",
                     fwd->connect_port);
                 if (muxclient_command == SSHMUX_COMMAND_FORWARD)
-                        fprintf(stdout, "%u\n", fwd->allocated_port);
+                        fprintf(stdout, "%i\n", fwd->allocated_port);
                 break;
         case MUX_S_PERMISSION_DENIED:
                 e = buffer_get_string(&m, NULL);
@@ -2169,7 +2169,7 @@ muxclient(const char *path)
         case SSHMUX_COMMAND_ALIVE_CHECK:
                 if ((pid = mux_client_request_alive(sock)) == 0)
                         fatal("%s: master alive check failed", __func__);
-                fprintf(stderr, "Master running (pid=%d)\r\n", pid);
+                fprintf(stderr, "Master running (pid=%u)\r\n", pid);
                 exit(0);
         case SSHMUX_COMMAND_TERMINATE:
                 mux_client_request_terminate(sock);
diff --git a/ssh-add.c b/ssh-add.c
index d8d6481f2..cd13d87e5 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-add.c,v 1.125 2015/09/13 14:39:16 tim Exp $ */
+/* $OpenBSD: ssh-add.c,v 1.126 2015/10/15 23:51:40 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -384,7 +384,7 @@ list_identities(int agent_fd, int do_fp)
                         if (do_fp) {
                                 fp = sshkey_fingerprint(idlist->keys[i],
                                     fingerprint_hash, SSH_FP_DEFAULT);
-                                printf("%d %s %s (%s)\n",
+                                printf("%u %s %s (%s)\n",
                                     sshkey_size(idlist->keys[i]),
                                     fp == NULL ? "(null)" : fp,
                                     idlist->comments[i],
diff --git a/ssh.c b/ssh.c
index a6e4de3ea..43ed45557 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.426 2015/09/24 06:15:11 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.427 2015/10/15 23:51:40 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -250,7 +250,7 @@ resolve_host(const char *name, int port, int logerr, char *cname, size_t clen)
         if (port <= 0)
                 port = default_ssh_port();
 
-        snprintf(strport, sizeof strport, "%u", port);
+        snprintf(strport, sizeof strport, "%d", port);
         memset(&hints, 0, sizeof(hints));
         hints.ai_family = options.address_family == -1 ?
             AF_UNSPEC : options.address_family;