On Mon, Feb 29, 2016 at 07:56:22PM +0100, Jeremie Courreges-Anglas wrote:
>
> ok?
Looks good to me.
>
> Index: libexec/ftpd/monitor_fdpass.c
> ===================================================================
> RCS file: /cvs/src/libexec/ftpd/monitor_fdpass.c,v
> retrieving revision 1.6
> diff -u -p -r1.6 monitor_fdpass.c
> --- libexec/ftpd/monitor_fdpass.c 12 Nov 2013 04:44:14 -0000 1.6
> +++ libexec/ftpd/monitor_fdpass.c 29 Feb 2016 18:51:38 -0000
> @@ -62,8 +62,8 @@ send_fd(int sock, int fd)
> if ((n = sendmsg(sock, &msg, 0)) == -1)
> syslog(LOG_WARNING, "send_fd: sendmsg(%d): %m", sock);
> if (n != sizeof(int))
> - syslog(LOG_WARNING, "send_fd: sendmsg: expected sent 1 got %ld",
> - (long)n);
> + syslog(LOG_WARNING, "send_fd: sendmsg: expected sent 1 got %zd",
> + n);
> }
>
> int
> @@ -94,7 +94,7 @@ recv_fd(int sock)
> }
> if (n != sizeof(int))
> syslog(LOG_WARNING,
> - "recv_fd: recvmsg: expected received 1 got %ld", (long)n);
> + "recv_fd: recvmsg: expected received 1 got %zd", n);
> if (result == 0) {
> cmsg = CMSG_FIRSTHDR(&msg);
> if (cmsg == NULL) {
> Index: sbin/isakmpd/monitor_fdpass.c
> ===================================================================
> RCS file: /cvs/src/sbin/isakmpd/monitor_fdpass.c,v
> retrieving revision 1.16
> diff -u -p -r1.16 monitor_fdpass.c
> --- sbin/isakmpd/monitor_fdpass.c 24 Mar 2008 16:11:08 -0000 1.16
> +++ sbin/isakmpd/monitor_fdpass.c 29 Feb 2016 18:51:38 -0000
> @@ -67,8 +67,7 @@ mm_send_fd(int socket, int fd)
> return -1;
> }
> if (n != 1) {
> - log_error("mm_send_fd: sendmsg: expected sent 1 got %ld",
> - (long)n);
> + log_error("mm_send_fd: sendmsg: expected sent 1 got %zd", n);
> return -1;
> }
> return 0;
> @@ -101,8 +100,8 @@ mm_receive_fd(int socket)
> return -1;
> }
> if (n != 1) {
> - log_error("mm_receive_fd: recvmsg: expected received 1 got %ld",
> - (long)n);
> + log_error("mm_receive_fd: recvmsg: expected received 1 got %zd",
> + n);
> return -1;
> }
> cmsg = CMSG_FIRSTHDR(&msg);
> Index: usr.bin/ssh/monitor_fdpass.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/ssh/monitor_fdpass.c,v
> retrieving revision 1.20
> diff -u -p -r1.20 monitor_fdpass.c
> --- usr.bin/ssh/monitor_fdpass.c 25 Feb 2015 23:05:47 -0000 1.20
> +++ usr.bin/ssh/monitor_fdpass.c 29 Feb 2016 18:51:38 -0000
> @@ -79,8 +79,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;
> @@ -123,8 +122,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;
> }
>
>
>
> --
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
>
