- (tim) [configure.ac] Bug 1078. Fix --without-kerberos5. Reported by

[openssh.git] / monitor_fdpass.c

diff --git a/monitor_fdpass.c b/monitor_fdpass.c
index fd55a27768ede6696e8826373a7a55abb8702504..dd1a139841da40b207d671aeb292c3a36c0afcfd 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.6 2004/08/13 02:51:48 djm Exp $");
 
 #include <sys/uio.h>
 
@@ -32,11 +32,13 @@ RCSID("$OpenBSD: monitor_fdpass.c,v 1.1 2002/03/18 17:27:22 provos Exp $");
 #include "monitor_fdpass.h"
 
 void
-mm_send_fd(int socket, int fd)
+mm_send_fd(int sock, int fd)
 {
+#if defined(HAVE_SENDMSG) && (defined(HAVE_ACCRIGHTS_IN_MSGHDR) || defined(HAVE_CONTROL_IN_MSGHDR))
        struct msghdr msg;
        struct iovec vec;
-       char ch;
+       char ch = '\0';
+       ssize_t n;
 #ifndef HAVE_ACCRIGHTS_IN_MSGHDR
        char tmp[CMSG_SPACE(sizeof(int))];
        struct cmsghdr *cmsg;
@@ -61,21 +63,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(sock, &msg, 0)) == -1)
+               fatal("%s: sendmsg(%d): %s", __func__, fd,
+                   strerror(errno));
+       if (n != 1)
+               fatal("%s: sendmsg: expected sent 1 got %ld",
+                   __func__, (long)n);
+#else
+       fatal("%s: UsePrivilegeSeparation=yes not supported",
+           __func__);
+#endif
 }
 
 int
-mm_receive_fd(int socket)
+mm_receive_fd(int sock)
 {
+#if defined(HAVE_RECVMSG) && (defined(HAVE_ACCRIGHTS_IN_MSGHDR) || defined(HAVE_CONTROL_IN_MSGHDR))
        struct msghdr msg;
        struct iovec vec;
+       ssize_t n;
        char ch;
+       int fd;
 #ifndef HAVE_ACCRIGHTS_IN_MSGHDR
        char tmp[CMSG_SPACE(sizeof(int))];
        struct cmsghdr *cmsg;
-#else
-       int fd;
 #endif
 
        memset(&msg, 0, sizeof(msg));
@@ -91,18 +102,29 @@ mm_receive_fd(int socket)
        msg.msg_controllen = sizeof(tmp);
 #endif
 
-       if (recvmsg(socket, &msg, 0) == -1)
-               fatal("%s: recvmsg", __FUNCTION__);
+       if ((n = recvmsg(sock, &msg, 0)) == -1)
+               fatal("%s: recvmsg: %s", __func__, strerror(errno));
+       if (n != 1)
+               fatal("%s: recvmsg: expected received 1 got %ld",
+                   __func__, (long)n);
 
 #ifdef HAVE_ACCRIGHTS_IN_MSGHDR
        if (msg.msg_accrightslen != sizeof(fd))
-               fatal("%s: no fd", __FUNCTION__);
-       return fd;
+               fatal("%s: no fd", __func__);
 #else
        cmsg = CMSG_FIRSTHDR(&msg);
+       if (cmsg == NULL)
+               fatal("%s: no message header", __func__);
+#ifndef BROKEN_CMSG_TYPE
        if (cmsg->cmsg_type != SCM_RIGHTS)
-               fatal("%s: expected type %d got %d", __FUNCTION__,
+               fatal("%s: expected type %d got %d", __func__,
                    SCM_RIGHTS, cmsg->cmsg_type);
-       return (*(int *)CMSG_DATA(cmsg));
+#endif
+       fd = (*(int *)CMSG_DATA(cmsg));
+#endif
+       return fd;
+#else
+       fatal("%s: UsePrivilegeSeparation=yes not supported",
+           __func__);
 #endif
 }