diff options
Diffstat (limited to 'monitor_fdpass.c')
-rw-r--r-- | monitor_fdpass.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/monitor_fdpass.c b/monitor_fdpass.c index 22b7882bd..f0dd88e7e 100644 --- a/monitor_fdpass.c +++ b/monitor_fdpass.c | |||
@@ -24,7 +24,7 @@ | |||
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include "includes.h" | 26 | #include "includes.h" |
27 | RCSID("$OpenBSD: monitor_fdpass.c,v 1.4 2002/06/26 14:50:04 deraadt Exp $"); | 27 | RCSID("$OpenBSD: monitor_fdpass.c,v 1.5 2004/06/21 17:36:31 avsm Exp $"); |
28 | 28 | ||
29 | #include <sys/uio.h> | 29 | #include <sys/uio.h> |
30 | 30 | ||
@@ -32,7 +32,7 @@ RCSID("$OpenBSD: monitor_fdpass.c,v 1.4 2002/06/26 14:50:04 deraadt Exp $"); | |||
32 | #include "monitor_fdpass.h" | 32 | #include "monitor_fdpass.h" |
33 | 33 | ||
34 | void | 34 | void |
35 | mm_send_fd(int socket, int fd) | 35 | mm_send_fd(int sock, int fd) |
36 | { | 36 | { |
37 | #if defined(HAVE_SENDMSG) && (defined(HAVE_ACCRIGHTS_IN_MSGHDR) || defined(HAVE_CONTROL_IN_MSGHDR)) | 37 | #if defined(HAVE_SENDMSG) && (defined(HAVE_ACCRIGHTS_IN_MSGHDR) || defined(HAVE_CONTROL_IN_MSGHDR)) |
38 | struct msghdr msg; | 38 | struct msghdr msg; |
@@ -63,7 +63,7 @@ mm_send_fd(int socket, int fd) | |||
63 | msg.msg_iov = &vec; | 63 | msg.msg_iov = &vec; |
64 | msg.msg_iovlen = 1; | 64 | msg.msg_iovlen = 1; |
65 | 65 | ||
66 | if ((n = sendmsg(socket, &msg, 0)) == -1) | 66 | if ((n = sendmsg(sock, &msg, 0)) == -1) |
67 | fatal("%s: sendmsg(%d): %s", __func__, fd, | 67 | fatal("%s: sendmsg(%d): %s", __func__, fd, |
68 | strerror(errno)); | 68 | strerror(errno)); |
69 | if (n != 1) | 69 | if (n != 1) |
@@ -76,7 +76,7 @@ mm_send_fd(int socket, int fd) | |||
76 | } | 76 | } |
77 | 77 | ||
78 | int | 78 | int |
79 | mm_receive_fd(int socket) | 79 | mm_receive_fd(int sock) |
80 | { | 80 | { |
81 | #if defined(HAVE_RECVMSG) && (defined(HAVE_ACCRIGHTS_IN_MSGHDR) || defined(HAVE_CONTROL_IN_MSGHDR)) | 81 | #if defined(HAVE_RECVMSG) && (defined(HAVE_ACCRIGHTS_IN_MSGHDR) || defined(HAVE_CONTROL_IN_MSGHDR)) |
82 | struct msghdr msg; | 82 | struct msghdr msg; |
@@ -102,7 +102,7 @@ mm_receive_fd(int socket) | |||
102 | msg.msg_controllen = sizeof(tmp); | 102 | msg.msg_controllen = sizeof(tmp); |
103 | #endif | 103 | #endif |
104 | 104 | ||
105 | if ((n = recvmsg(socket, &msg, 0)) == -1) | 105 | if ((n = recvmsg(sock, &msg, 0)) == -1) |
106 | fatal("%s: recvmsg: %s", __func__, strerror(errno)); | 106 | fatal("%s: recvmsg: %s", __func__, strerror(errno)); |
107 | if (n != 1) | 107 | if (n != 1) |
108 | fatal("%s: recvmsg: expected received 1 got %ld", | 108 | fatal("%s: recvmsg: expected received 1 got %ld", |