From 7011c19a8c96a2f8fb7c04d61cb28cdc507584a6 Mon Sep 17 00:00:00 2001 From: cvs2svn Date: Fri, 21 Jan 2005 15:36:45 +0000 Subject: This commit was manufactured by cvs2svn to create tag 'RELEASE_4_11_0'. --- security/gnome-keyring/files/patch-gnome-keyring.c | 92 ---------------------- 1 file changed, 92 deletions(-) delete mode 100644 security/gnome-keyring/files/patch-gnome-keyring.c (limited to 'security/gnome-keyring/files/patch-gnome-keyring.c') diff --git a/security/gnome-keyring/files/patch-gnome-keyring.c b/security/gnome-keyring/files/patch-gnome-keyring.c deleted file mode 100644 index ebac2c91d812..000000000000 --- a/security/gnome-keyring/files/patch-gnome-keyring.c +++ /dev/null @@ -1,92 +0,0 @@ ---- gnome-keyring.c.orig Tue Sep 7 00:05:37 2004 -+++ gnome-keyring.c Fri Dec 17 10:06:11 2004 -@@ -36,6 +36,7 @@ - #include - #include - #include -+#include - #include - #include - -@@ -253,11 +254,39 @@ - { - char buf; - int bytes_written; -+#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS) -+ struct { -+ struct cmsghdr hdr; -+ struct cmsgcred cred; -+ } cmsg; -+ struct iovec iov; -+ struct msghdr msg; -+#endif -+ -+ buf = 0; -+#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS) -+ iov.iov_base = &buf; -+ iov.iov_len = 1; -+ -+ memset (&msg, 0, sizeof (msg)); -+ msg.msg_iov = &iov; -+ msg.msg_iovlen = 1; -+ -+ msg.msg_control = &cmsg; -+ msg.msg_controllen = sizeof (cmsg); -+ memset (&cmsg, 0, sizeof (cmsg)); -+ cmsg.hdr.cmsg_len = sizeof (cmsg); -+ cmsg.hdr.cmsg_level = SOL_SOCKET; -+ cmsg.hdr.cmsg_type = SCM_CREDS; -+#endif - - again: - -- buf = 0; -+#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS) -+ bytes_written = sendmsg (socket, &msg, 0); -+#else - bytes_written = write (socket, &buf, 1); -+#endif - - if (bytes_written < 0 && errno == EINTR) - goto again; -@@ -275,11 +304,39 @@ - { - char buf; - int bytes_written; -+#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS) -+ struct { -+ struct cmsghdr hdr; -+ struct cmsgcred cred; -+ } cmsg; -+ struct iovec iov; -+ struct msghdr msg; -+#endif -+ -+ buf = 0; -+#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS) -+ iov.iov_base = &buf; -+ iov.iov_len = 1; -+ -+ memset (&msg, 0, sizeof (msg)); -+ msg.msg_iov = &iov; -+ msg.msg_iovlen = 1; -+ -+ msg.msg_control = &cmsg; -+ msg.msg_controllen = sizeof (cmsg); -+ memset (&cmsg, 0, sizeof (cmsg)); -+ cmsg.hdr.cmsg_len = sizeof (cmsg); -+ cmsg.hdr.cmsg_level = SOL_SOCKET; -+ cmsg.hdr.cmsg_type = SCM_CREDS; -+#endif - - again: - -- buf = 0; -+#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS) -+ bytes_written = sendmsg (op->socket, &msg, 0); -+#else - bytes_written = write (op->socket, &buf, 1); -+#endif - - if (bytes_written < 0 && errno == EINTR) - goto again; -- cgit v1.2.3