diff options
| author | marcus <marcus@FreeBSD.org> | 2004-05-12 04:52:07 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2004-05-12 04:52:07 +0800 |
| commit | f550ae5528b9862a08dce6110696f96e539ed7ee (patch) | |
| tree | a92c42f169ee2d29b2f909542d4e078b6a25c20b /security | |
| parent | 4cbfe55d5e1142f49193e1cac26de58daf6639ac (diff) | |
| download | freebsd-ports-gnome-f550ae5528b9862a08dce6110696f96e539ed7ee.tar.gz freebsd-ports-gnome-f550ae5528b9862a08dce6110696f96e539ed7ee.tar.zst freebsd-ports-gnome-f550ae5528b9862a08dce6110696f96e539ed7ee.zip | |
This patch isn't actually needed. The default daemon code works just fine.
Diffstat (limited to 'security')
| -rw-r--r-- | security/gnome-keyring/files/patch-gnome-keyring-daemon-io.c | 35 | ||||
| -rw-r--r-- | security/gnomekeyring/files/patch-gnome-keyring-daemon-io.c | 35 |
2 files changed, 0 insertions, 70 deletions
diff --git a/security/gnome-keyring/files/patch-gnome-keyring-daemon-io.c b/security/gnome-keyring/files/patch-gnome-keyring-daemon-io.c deleted file mode 100644 index 84e2756577da..000000000000 --- a/security/gnome-keyring/files/patch-gnome-keyring-daemon-io.c +++ /dev/null @@ -1,35 +0,0 @@ ---- gnome-keyring-daemon-io.c.orig Tue May 11 15:31:33 2004 -+++ gnome-keyring-daemon-io.c Tue May 11 16:27:21 2004 -@@ -99,7 +99,7 @@ - struct iovec iov; - char buf; - --#ifdef HAVE_CMSGCRED -+#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS) - char cmsgmem[CMSG_SPACE (sizeof (struct cmsgcred))]; - struct cmsghdr *cmsg = (struct cmsghdr *) cmsgmem; - #endif -@@ -118,18 +118,17 @@ - } - #endif - -- iov.iov_base = &buf; -- iov.iov_len = 1; -- - memset (&msg, 0, sizeof (msg)); - msg.msg_iov = &iov; - msg.msg_iovlen = 1; - --#ifdef HAVE_CMSGCRED -- memset (cmsgmem, 0, sizeof (cmsgmem)); -- msg.msg_control = cmsgmem; -+#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS) -+ msg.msg_control = (char *) cmsg; - msg.msg_controllen = sizeof (cmsgmem); -+ memset (cmsg, 0, sizeof (cmsgmem)); - #endif -+ iov.iov_base = &buf; -+ iov.iov_len = 1; - - again: - if (recvmsg (fd, &msg, 0) < 0) { diff --git a/security/gnomekeyring/files/patch-gnome-keyring-daemon-io.c b/security/gnomekeyring/files/patch-gnome-keyring-daemon-io.c deleted file mode 100644 index 84e2756577da..000000000000 --- a/security/gnomekeyring/files/patch-gnome-keyring-daemon-io.c +++ /dev/null @@ -1,35 +0,0 @@ ---- gnome-keyring-daemon-io.c.orig Tue May 11 15:31:33 2004 -+++ gnome-keyring-daemon-io.c Tue May 11 16:27:21 2004 -@@ -99,7 +99,7 @@ - struct iovec iov; - char buf; - --#ifdef HAVE_CMSGCRED -+#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS) - char cmsgmem[CMSG_SPACE (sizeof (struct cmsgcred))]; - struct cmsghdr *cmsg = (struct cmsghdr *) cmsgmem; - #endif -@@ -118,18 +118,17 @@ - } - #endif - -- iov.iov_base = &buf; -- iov.iov_len = 1; -- - memset (&msg, 0, sizeof (msg)); - msg.msg_iov = &iov; - msg.msg_iovlen = 1; - --#ifdef HAVE_CMSGCRED -- memset (cmsgmem, 0, sizeof (cmsgmem)); -- msg.msg_control = cmsgmem; -+#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS) -+ msg.msg_control = (char *) cmsg; - msg.msg_controllen = sizeof (cmsgmem); -+ memset (cmsg, 0, sizeof (cmsgmem)); - #endif -+ iov.iov_base = &buf; -+ iov.iov_len = 1; - - again: - if (recvmsg (fd, &msg, 0) < 0) { |