+/* $OpenBSD: monitor_fdpass.c,v 1.12 2006/08/03 03:34:42 deraadt Exp $ */
/*
* Copyright 2001 Niels Provos <provos@citi.umich.edu>
* All rights reserved.
*/
#include "includes.h"
-RCSID("$OpenBSD$");
+#include <sys/types.h>
+#include <sys/socket.h>
#include <sys/uio.h>
-#include "ssh.h"
+#include <errno.h>
+#include <string.h>
+#include <stdarg.h>
+
#include "log.h"
-#include "xmalloc.h"
-#include "misc.h"
#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 = '\0';
+ ssize_t n;
+#ifndef HAVE_ACCRIGHTS_IN_MSGHDR
char tmp[CMSG_SPACE(sizeof(int))];
struct cmsghdr *cmsg;
- struct iovec vec;
- char ch;
+#endif
memset(&msg, 0, sizeof(msg));
+#ifdef HAVE_ACCRIGHTS_IN_MSGHDR
+ msg.msg_accrights = (caddr_t)&fd;
+ msg.msg_accrightslen = sizeof(fd);
+#else
msg.msg_control = (caddr_t)tmp;
msg.msg_controllen = CMSG_LEN(sizeof(int));
cmsg = CMSG_FIRSTHDR(&msg);
cmsg->cmsg_level = SOL_SOCKET;
cmsg->cmsg_type = SCM_RIGHTS;
*(int *)CMSG_DATA(cmsg) = fd;
+#endif
vec.iov_base = &ch;
vec.iov_len = 1;
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;
- char tmp[CMSG_SPACE(sizeof(int))];
- struct cmsghdr *cmsg;
struct iovec vec;
+ ssize_t n;
char ch;
+ int fd;
+#ifndef HAVE_ACCRIGHTS_IN_MSGHDR
+ char tmp[CMSG_SPACE(sizeof(int))];
+ struct cmsghdr *cmsg;
+#endif
memset(&msg, 0, sizeof(msg));
vec.iov_base = &ch;
vec.iov_len = 1;
msg.msg_iov = &vec;
msg.msg_iovlen = 1;
+#ifdef HAVE_ACCRIGHTS_IN_MSGHDR
+ msg.msg_accrights = (caddr_t)&fd;
+ msg.msg_accrightslen = sizeof(fd);
+#else
msg.msg_control = tmp;
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", __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
}