commit cdf92942b18422a49ca615a10bae0adddf6fa6f4
author Alexandre Julliard <julliard@winehq.org> Fri Sep 16 18:52:47 2005 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Sep 16 18:52:47 2005 +0000
tree 1e509f81dc975838f8324584ee4441a8882258b8
parent 1476116b3acd8bc8503a486266bb8c48f88ac7a2

Use the proper size for the cmsg_fd structure on 64-bit plaforms.

server/request.c

diff --git a/server/request.c b/server/request.c
index 6aa0072..71ee445 100644
--- a/server/request.c
+++ b/server/request.c
@@ -122,12 +122,15 @@
 #ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS
 struct cmsg_fd
 {
-    int len;   /* size of structure */
-    int level; /* SOL_SOCKET */
-    int type;  /* SCM_RIGHTS */
-    int fd;    /* fd to pass */
+    struct
+    {
+        size_t len;   /* size of structure */
+        int    level; /* SOL_SOCKET */
+        int    type;  /* SCM_RIGHTS */
+    } header;
+    int fd;           /* fd to pass */
 };
-static struct cmsg_fd cmsg = { sizeof(cmsg), SOL_SOCKET, SCM_RIGHTS, -1 };
+static struct cmsg_fd cmsg = { { sizeof(cmsg.header) + sizeof(cmsg.fd), SOL_SOCKET, SCM_RIGHTS }, -1 };
 #endif  /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */
 
 /* complain about a protocol error and terminate the client connection */
@@ -350,7 +353,7 @@
     msghdr.msg_accrights = (void *)&fd;
 #else  /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */
     msghdr.msg_control    = &cmsg;
-    msghdr.msg_controllen = sizeof(cmsg);
+    msghdr.msg_controllen = sizeof(cmsg.header) + sizeof(fd);
     cmsg.fd = -1;
 #endif  /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */
 
@@ -420,7 +423,7 @@
     msghdr.msg_accrights = (void *)&fd;
 #else  /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */
     msghdr.msg_control    = &cmsg;
-    msghdr.msg_controllen = sizeof(cmsg);
+    msghdr.msg_controllen = sizeof(cmsg.header) + sizeof(fd);
     cmsg.fd = fd;
 #endif  /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */