aboutsummaryrefslogtreecommitdiff
path: root/monitor_fdpass.c
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>2017-01-31 12:29:48 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>2017-01-31 12:29:48 +0000
commitab4ec008e7abd1c8098428dbf9642c3685383045 (patch)
treefeb16b3395021bd0f5667967c25f2bb77f8b691e /monitor_fdpass.c
parent8f8c559269bccf737d318b89630a0ef812865b99 (diff)
downloadsrc-ab4ec008e7abd1c8098428dbf9642c3685383045.tar.gz
src-ab4ec008e7abd1c8098428dbf9642c3685383045.zip
Vendor import of OpenSSH 7.3p1.vendor/openssh/7.3p1
Notes
Notes: svn path=/vendor-crypto/openssh/dist/; revision=313010 svn path=/vendor-crypto/openssh/7.3p1/; revision=313011; tag=vendor/openssh/7.3p1
Diffstat (limited to 'monitor_fdpass.c')
-rw-r--r--monitor_fdpass.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/monitor_fdpass.c b/monitor_fdpass.c
index 2ddd80732f3a..d766edcf11ca 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;
}