- 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 fd55a27768ede6696e8826373a7a55abb8702504..fb97171ff5f5647d2478d0c5daf20dcaa5bf5a32 100644 (file)
--- a/monitor_fdpass.c
+++ b/monitor_fdpass.c
@@ -24,7 +24,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: monitor_fdpass.c,v 1.1 2002/03/18 17:27:22 provos Exp $");
+RCSID("$OpenBSD: monitor_fdpass.c,v 1.2 2002/03/24 17:53:16 stevesk Exp $");
 
 #include <sys/uio.h>
 
@@ -34,16 +34,19 @@ RCSID("$OpenBSD: monitor_fdpass.c,v 1.1 2002/03/18 17:27:22 provos Exp $");
 void
 mm_send_fd(int socket, int fd)
 {
+#if defined(HAVE_SENDMSG) && (defined(HAVE_ACCRIGHTS_IN_MSGHDR) || defined(HAVE_CONTROL_IN_MSGHDR))
        struct msghdr msg;
        struct iovec vec;
-       char ch;
-#ifndef HAVE_ACCRIGHTS_IN_MSGHDR
+       char ch = '\0';
+       int n;
+#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
@@ -61,21 +64,30 @@ mm_send_fd(int socket, int fd)
        msg.msg_iov = &vec;
        msg.msg_iovlen = 1;
 
-       if (sendmsg(socket, &msg, 0) == -1)
-               fatal("%s: sendmsg(%d)", __FUNCTION__, fd);
+       if ((n = sendmsg(socket, &msg, 0)) == -1)
+               fatal("%s: sendmsg(%d): %s", __FUNCTION__, fd,
+                   strerror(errno));
+       if (n != 1)
+               fatal("%s: sendmsg: expected sent 1 got %d",
+                   __FUNCTION__, n);
+#else
+       fatal("%s: UsePrivilegeSeparation=yes not supported",
+           __FUNCTION__);
+#endif
 }
 
 int
 mm_receive_fd(int socket)
 {
+#if defined(HAVE_RECVMSG) && (defined(HAVE_ACCRIGHTS_IN_MSGHDR) || defined(HAVE_CONTROL_IN_MSGHDR))
        struct msghdr msg;
        struct iovec vec;
        char ch;
-#ifndef HAVE_ACCRIGHTS_IN_MSGHDR
+       int fd, n;
+#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;
-#else
-       int fd;
 #endif
 
        memset(&msg, 0, sizeof(msg));
@@ -83,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
@@ -91,18 +103,25 @@ mm_receive_fd(int socket)
        msg.msg_controllen = sizeof(tmp);
 #endif
 
-       if (recvmsg(socket, &msg, 0) == -1)
-               fatal("%s: recvmsg", __FUNCTION__);
+       if ((n = recvmsg(socket, &msg, 0)) == -1)
+               fatal("%s: recvmsg: %s", __FUNCTION__, strerror(errno));
+       if (n != 1)
+               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__);
-       return fd;
 #else
        cmsg = CMSG_FIRSTHDR(&msg);
        if (cmsg->cmsg_type != SCM_RIGHTS)
                fatal("%s: expected type %d got %d", __FUNCTION__,
                    SCM_RIGHTS, cmsg->cmsg_type);
-       return (*(int *)CMSG_DATA(cmsg));
+       fd = (*(int *)CMSG_DATA(cmsg));
+#endif
+       return fd;
+#else
+       fatal("%s: UsePrivilegeSeparation=yes not supported",
+           __FUNCTION__);
 #endif
 }