bc0b6d6721
works, it does not provide the pid information that the cmsgcred structure gives us. Dbus and gnomekeyring will now behave the same way on all versions of FreeBSD.
60 lines
1.7 KiB
C
60 lines
1.7 KiB
C
--- gnome-keyring-daemon-io.c.orig Mon Feb 21 02:50:03 2005
|
|
+++ gnome-keyring-daemon-io.c Tue Apr 26 01:56:16 2005
|
|
@@ -100,14 +100,16 @@ read_unix_socket_credentials (int fd,
|
|
char buf;
|
|
|
|
#ifdef HAVE_CMSGCRED
|
|
- char cmsgmem[CMSG_SPACE (sizeof (struct cmsgcred))];
|
|
- struct cmsghdr *cmsg = (struct cmsghdr *) cmsgmem;
|
|
+ struct {
|
|
+ struct cmsghdr hdr;
|
|
+ struct cmsgcred cred;
|
|
+ } cmsg;
|
|
#endif
|
|
|
|
*pid = 0;
|
|
*uid = 0;
|
|
|
|
-#if defined(LOCAL_CREDS) && defined(HAVE_CMSGCRED)
|
|
+#if defined(LOCAL_CREDS) && defined(HAVE_CMSGCRED) && !defined(__FreeBSD__)
|
|
/* Set the socket to receive credentials on the next message */
|
|
{
|
|
int on = 1;
|
|
@@ -126,9 +128,9 @@ read_unix_socket_credentials (int fd,
|
|
msg.msg_iovlen = 1;
|
|
|
|
#ifdef HAVE_CMSGCRED
|
|
- memset (cmsgmem, 0, sizeof (cmsgmem));
|
|
- msg.msg_control = cmsgmem;
|
|
- msg.msg_controllen = sizeof (cmsgmem);
|
|
+ memset (&cmsg, 0, sizeof (cmsg));
|
|
+ msg.msg_control = &cmsg;
|
|
+ msg.msg_controllen = sizeof (cmsg);
|
|
#endif
|
|
|
|
again:
|
|
@@ -147,7 +149,8 @@ read_unix_socket_credentials (int fd,
|
|
}
|
|
|
|
#ifdef HAVE_CMSGCRED
|
|
- if (cmsg->cmsg_len < sizeof (cmsgmem) || cmsg->cmsg_type != SCM_CREDS) {
|
|
+ if (cmsg.hdr.cmsg_len < sizeof (cmsg) ||
|
|
+ cmsg.hdr.cmsg_type != SCM_CREDS) {
|
|
g_warning ("Message from recvmsg() was not SCM_CREDS\n");
|
|
return FALSE;
|
|
}
|
|
@@ -168,12 +171,8 @@ read_unix_socket_credentials (int fd,
|
|
return FALSE;
|
|
}
|
|
#elif defined(HAVE_CMSGCRED)
|
|
- struct cmsgcred *cred;
|
|
-
|
|
- cred = (struct cmsgcred *) CMSG_DATA (cmsg);
|
|
-
|
|
- *pid = cred->cmcred_pid;
|
|
- *uid = cred->cmcred_euid;
|
|
+ *pid = cmsg.cred.cmcred_pid;
|
|
+ *uid = cmsg.cred.cmcred_euid;
|
|
#else /* !SO_PEERCRED && !HAVE_CMSGCRED */
|
|
g_warning ("Socket credentials not supported on this OS\n");
|
|
return FALSE;
|