- itojun@cvs.openbsd.org 2002/05/13 02:37:39

[openssh.git] / monitor_fdpass.c

diff --git a/monitor_fdpass.c b/monitor_fdpass.c
index 0045977e45f5d35a521917b4145b646f67f04274..fb97171ff5f5647d2478d0c5daf20dcaa5bf5a32 100644 (file)
--- a/monitor_fdpass.c
+++ b/monitor_fdpass.c
@@ -34,18 +34,19 @@ RCSID("$OpenBSD: monitor_fdpass.c,v 1.2 2002/03/24 17:53:16 stevesk Exp $");
 void
 mm_send_fd(int socket, int fd)
 {
-#if defined(HAVE_ACCRIGHTS_IN_MSGHDR) || defined(HAVE_CONTROL_IN_MSGHDR)
+#if defined(HAVE_SENDMSG) && (defined(HAVE_ACCRIGHTS_IN_MSGHDR) || defined(HAVE_CONTROL_IN_MSGHDR))
        struct msghdr msg;
        struct iovec vec;
        char ch = '\0';
        int n;
-#ifndef HAVE_ACCRIGHTS_IN_MSGHDR
+#if !defined(HAVE_ACCRIGHTS_IN_MSGHDR) || \
+       (defined(HAVE_ACCRIGHTS_IN_MSGHDR) && defined(HAVE_CONTROL_IN_MSGHDR))
        char tmp[CMSG_SPACE(sizeof(int))];
        struct cmsghdr *cmsg;
 #endif
 
        memset(&msg, 0, sizeof(msg));
-#ifdef HAVE_ACCRIGHTS_IN_MSGHDR
+#if defined(HAVE_ACCRIGHTS_IN_MSGHDR) && !defined(HAVE_CONTROL_IN_MSGHDR)
        msg.msg_accrights = (caddr_t)&fd;
        msg.msg_accrightslen = sizeof(fd);
 #else
@@ -78,12 +79,13 @@ mm_send_fd(int socket, int fd)
 int
 mm_receive_fd(int socket)
 {
-#if defined(HAVE_ACCRIGHTS_IN_MSGHDR) || defined(HAVE_CONTROL_IN_MSGHDR)
+#if defined(HAVE_RECVMSG) && (defined(HAVE_ACCRIGHTS_IN_MSGHDR) || defined(HAVE_CONTROL_IN_MSGHDR))
        struct msghdr msg;
        struct iovec vec;
        char ch;
        int fd, n;
-#ifndef HAVE_ACCRIGHTS_IN_MSGHDR
+#if !defined(HAVE_ACCRIGHTS_IN_MSGHDR) || \
+       (defined(HAVE_ACCRIGHTS_IN_MSGHDR) && defined(HAVE_CONTROL_IN_MSGHDR))
        char tmp[CMSG_SPACE(sizeof(int))];
        struct cmsghdr *cmsg;
 #endif
@@ -93,7 +95,7 @@ mm_receive_fd(int socket)
        vec.iov_len = 1;
        msg.msg_iov = &vec;
        msg.msg_iovlen = 1;
-#ifdef HAVE_ACCRIGHTS_IN_MSGHDR
+#if defined(HAVE_ACCRIGHTS_IN_MSGHDR) && !defined(HAVE_CONTROL_IN_MSGHDR)
        msg.msg_accrights = (caddr_t)&fd;
        msg.msg_accrightslen = sizeof(fd);
 #else
@@ -107,7 +109,7 @@ mm_receive_fd(int socket)
                fatal("%s: recvmsg: expected received 1 got %d",
                    __FUNCTION__, n);
 
-#ifdef HAVE_ACCRIGHTS_IN_MSGHDR
+#if defined(HAVE_ACCRIGHTS_IN_MSGHDR) && !defined(HAVE_CONTROL_IN_MSGHDR)
        if (msg.msg_accrightslen != sizeof(fd))
                fatal("%s: no fd", __FUNCTION__);
 #else