summaryrefslogtreecommitdiff
path: root/monitor_fdpass.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2016-08-06 10:49:58 +0100
committerColin Watson <cjwatson@debian.org>2016-08-06 10:49:58 +0100
commita8ed8d256b2e2c05b0c15565a7938028c5192277 (patch)
tree87abbdc914a38b43e4e5bb9581ad1f46eabbf88e /monitor_fdpass.c
parentf0329aac23c61e1a5197d6d57349a63f459bccb0 (diff)
parent99522ba7ec6963a05c04a156bf20e3ba3605987c (diff)
Import openssh_7.3p1.orig.tar.gz
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 2ddd80732..d766edcf1 100644
--- a/monitor_fdpass.c
+++ b/monitor_fdpass.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: monitor_fdpass.c,v 1.20 2015/02/25 23:05:47 djm Exp $ */ 1/* $OpenBSD: monitor_fdpass.c,v 1.21 2016/02/29 20:22:36 jca Exp $ */
2/* 2/*
3 * Copyright 2001 Niels Provos <provos@citi.umich.edu> 3 * Copyright 2001 Niels Provos <provos@citi.umich.edu>
4 * All rights reserved. 4 * All rights reserved.
@@ -99,8 +99,7 @@ mm_send_fd(int sock, int fd)
99 } 99 }
100 100
101 if (n != 1) { 101 if (n != 1) {
102 error("%s: sendmsg: expected sent 1 got %ld", 102 error("%s: sendmsg: expected sent 1 got %zd", __func__, n);
103 __func__, (long)n);
104 return -1; 103 return -1;
105 } 104 }
106 return 0; 105 return 0;
@@ -155,8 +154,7 @@ mm_receive_fd(int sock)
155 } 154 }
156 155
157 if (n != 1) { 156 if (n != 1) {
158 error("%s: recvmsg: expected received 1 got %ld", 157 error("%s: recvmsg: expected received 1 got %zd", __func__, n);
159 __func__, (long)n);
160 return -1; 158 return -1;
161 } 159 }
162 160