- provos@cvs.openbsd.org 2002/03/18 17:50:31

     [auth-bsdauth.c auth-options.c auth-rh-rsa.c auth-rsa.c auth-skey.c auth.h
      auth1.c auth2-chall.c auth2.c kex.c kex.h kexdh.c kexgex.c servconf.c
      session.h servconf.h serverloop.c session.c sshd.c]
     integrate privilege separated openssh; its turned off by default for now.
     work done by me and markus@

applied, but outside of ensure that smaller code bits migrated with
their owners.. no work was tried to 'fix' it to work. =)  Later project!

1 files changed, 86 insertions, 0 deletions

diff --git a/monitor_fdpass.c b/monitor_fdpass.c
new file mode 100644
index 000000000..7785535bb
--- /dev/null
+++ b/monitor_fdpass.c
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2001 Niels Provos <provos@citi.umich.edu>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "includes.h"
+RCSID("$OpenBSD: monitor_fdpass.c,v 1.1 2002/03/18 17:27:22 provos Exp $");
+
+#include <sys/uio.h>
+
+#include "log.h"
+#include "monitor_fdpass.h"
+
+void
+mm_send_fd(int socket, int fd)
+{
+        struct msghdr msg;
+        char tmp[CMSG_SPACE(sizeof(int))];
+        struct cmsghdr *cmsg;
+        struct iovec vec;
+        char ch;
+
+        memset(&msg, 0, sizeof(msg));
+        msg.msg_control = (caddr_t)tmp;
+        msg.msg_controllen = CMSG_LEN(sizeof(int));
+        cmsg = CMSG_FIRSTHDR(&msg);
+        cmsg->cmsg_len = CMSG_LEN(sizeof(int));
+        cmsg->cmsg_level = SOL_SOCKET;
+        cmsg->cmsg_type = SCM_RIGHTS;
+        *(int *)CMSG_DATA(cmsg) = fd;
+
+        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);
+}
+
+int
+mm_receive_fd(int socket)
+{
+        struct msghdr msg;
+        char tmp[CMSG_SPACE(sizeof(int))];
+        struct cmsghdr *cmsg;
+        struct iovec vec;
+        char ch;
+
+        memset(&msg, 0, sizeof(msg));
+        vec.iov_base = &ch;
+        vec.iov_len = 1;
+        msg.msg_iov = &vec;
+        msg.msg_iovlen = 1;
+        msg.msg_control = tmp;
+        msg.msg_controllen = sizeof(tmp);
+
+        if (recvmsg(socket, &msg, 0) == -1)
+                fatal("%s: recvmsg", __FUNCTION__);
+
+        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));
+}