From: jca@openbsd.org <jca@openbsd.org>
Date: Mon, 29 Feb 2016 20:22:36 +0000 (+0000)
Subject: upstream commit
X-Git-Tag: V_7_3_P1~170
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18f64b969c70ed00e74b9d8e50359dbe698ce4c0;p=thirdparty%2Fopenssh-portable.git

upstream commit

Print ssize_t with %zd; ok deraadt@ mmcc@

Upstream-ID: 0590313bbb013ff6692298c98f7e0be349d124bd
---

diff --git a/monitor_fdpass.c b/monitor_fdpass.c
index 2ddd80732..d766edcf1 100644
--- a/monitor_fdpass.c
+++ b/monitor_fdpass.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor_fdpass.c,v 1.20 2015/02/25 23:05:47 djm Exp $ */
+/* $OpenBSD: monitor_fdpass.c,v 1.21 2016/02/29 20:22:36 jca Exp $ */
 /*
  * Copyright 2001 Niels Provos <provos@citi.umich.edu>
  * All rights reserved.
@@ -99,8 +99,7 @@ mm_send_fd(int sock, int fd)
 	}
 
 	if (n != 1) {
-		error("%s: sendmsg: expected sent 1 got %ld",
-		    __func__, (long)n);
+		error("%s: sendmsg: expected sent 1 got %zd", __func__, n);
 		return -1;
 	}
 	return 0;
@@ -155,8 +154,7 @@ mm_receive_fd(int sock)
 	}
 
 	if (n != 1) {
-		error("%s: recvmsg: expected received 1 got %ld",
-		    __func__, (long)n);
+		error("%s: recvmsg: expected received 1 got %zd", __func__, n);
 		return -1;
 	}