Merge 3.9p1 to the trunk.

1 files changed, 7 insertions, 5 deletions

diff --git a/monitor_fdpass.c b/monitor_fdpass.c
index 6508c9e47..f384c174c 100644
--- a/monitor_fdpass.c
+++ b/monitor_fdpass.c
@@ -24,7 +24,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: monitor_fdpass.c,v 1.4 2002/06/26 14:50:04 deraadt Exp $");
+RCSID("$OpenBSD: monitor_fdpass.c,v 1.6 2004/08/13 02:51:48 djm Exp $");
 
 #include <sys/uio.h>
 #include <sys/utsname.h>
@@ -56,7 +56,7 @@ cmsg_type_is_broken(void)
 }
 
 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;
@@ -87,7 +87,7 @@ mm_send_fd(int socket, int fd)
         msg.msg_iov = &vec;
         msg.msg_iovlen = 1;
 
-        if ((n = sendmsg(socket, &msg, 0)) == -1)
+        if ((n = sendmsg(sock, &msg, 0)) == -1)
                 fatal("%s: sendmsg(%d): %s", __func__, fd,
                     strerror(errno));
         if (n != 1)
@@ -100,7 +100,7 @@ mm_send_fd(int socket, int fd)
 }
 
 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;
@@ -126,7 +126,7 @@ mm_receive_fd(int socket)
         msg.msg_controllen = sizeof(tmp);
 #endif
 
-        if ((n = recvmsg(socket, &msg, 0)) == -1)
+        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",
@@ -137,6 +137,8 @@ mm_receive_fd(int socket)
                 fatal("%s: no fd", __func__);
 #else
         cmsg = CMSG_FIRSTHDR(&msg);
+        if (cmsg == NULL)
+                fatal("%s: no message header", __func__);
         if (!cmsg_type_is_broken() && cmsg->cmsg_type != SCM_RIGHTS)
                 fatal("%s: expected type %d got %d", __func__,
                     SCM_RIGHTS, cmsg->cmsg_type);