diff options
| author | cvs2svn <cvs2svn@FreeBSD.org> | 2005-10-16 07:41:55 +0000 |
|---|---|---|
| committer | cvs2svn <cvs2svn@FreeBSD.org> | 2005-10-16 07:41:55 +0000 |
| commit | 40a3261d1a6e2617f6afde0cd6d762a7e211af7a (patch) | |
| tree | d70bbf882801af3a4e58dde3ed6a1da1849479d4 /devel/dbus/files/patch-dbus_dbus-sysdeps.c | |
| parent | a9f801a2186fcb89f70f7dcb211c6d4922c0e3af (diff) | |
This commit was manufactured by cvs2svn to create tag 'RELEASE_6_0_0'.release/6.0.0
Notes
Notes:
svn path=/head/; revision=145533
svn path=/tags/RELEASE_6_0_0/; revision=145534; tag=release/6.0.0
Diffstat (limited to 'devel/dbus/files/patch-dbus_dbus-sysdeps.c')
| -rw-r--r-- | devel/dbus/files/patch-dbus_dbus-sysdeps.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/devel/dbus/files/patch-dbus_dbus-sysdeps.c b/devel/dbus/files/patch-dbus_dbus-sysdeps.c index 87b667d46573..66c5480d7908 100644 --- a/devel/dbus/files/patch-dbus_dbus-sysdeps.c +++ b/devel/dbus/files/patch-dbus_dbus-sysdeps.c @@ -1,12 +1,12 @@ ---- dbus/dbus-sysdeps.c.orig Thu Jun 16 01:51:46 2005 -+++ dbus/dbus-sysdeps.c Sat Jul 16 02:55:41 2005 +--- dbus/dbus-sysdeps.c.orig Wed Aug 3 13:42:56 2005 ++++ dbus/dbus-sysdeps.c Wed Aug 24 00:36:20 2005 @@ -742,16 +742,16 @@ write_credentials_byte (int { int bytes_written; char buf[1] = { '\0' }; -#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS) - struct { -+#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__)) ++#if defined(HAVE_CMSGCRED) + union { struct cmsghdr hdr; - struct cmsgcred cred; @@ -17,7 +17,7 @@ #endif -#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS) -+#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__)) ++#if defined(HAVE_CMSGCRED) iov.iov_base = buf; iov.iov_len = 1; @@ -40,7 +40,7 @@ again: -#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS) -+#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__)) ++#if defined(HAVE_CMSGCRED) bytes_written = sendmsg (server_fd, &msg, 0); #else bytes_written = write (server_fd, buf, 1); @@ -62,7 +62,7 @@ _dbus_credentials_clear (credentials); -#if defined(LOCAL_CREDS) && defined(HAVE_CMSGCRED) -+#if defined(LOCAL_CREDS) && defined(HAVE_CMSGCRED) && !defined(__FreeBSD__) ++#if defined(LOCAL_CREDS) && !defined(HAVE_CMSGCRED) /* Set the socket to receive credentials on the next message */ { int on = 1; @@ -81,7 +81,7 @@ } #ifdef HAVE_CMSGCRED -- if (cmsg->hdr.cmsg_len < sizeof (cmsg) || cmsg.hdr.cmsg_type != SCM_CREDS) +- if (cmsg.hdr.cmsg_len < sizeof (cmsg) || cmsg.hdr.cmsg_type != SCM_CREDS) + if (cmsg.hdr.cmsg_len < CMSG_LEN (sizeof (struct cmsgcred)) + || cmsg.hdr.cmsg_type != SCM_CREDS) { |