diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-07-19 04:22:08 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-07-19 04:22:08 +0800 |
| commit | 345c511d60252ac2f514d1d2f5802e8f27eb0294 (patch) | |
| tree | 6cf301e456fbca18ec51bdb7331c1dfe0fff475e /security/gnome-keyring/files | |
| parent | b57122357ae8ab7eb8109f1a5966710e517e8bcd (diff) | |
| download | marcuscom-ports-345c511d60252ac2f514d1d2f5802e8f27eb0294.tar marcuscom-ports-345c511d60252ac2f514d1d2f5802e8f27eb0294.tar.gz marcuscom-ports-345c511d60252ac2f514d1d2f5802e8f27eb0294.tar.bz2 marcuscom-ports-345c511d60252ac2f514d1d2f5802e8f27eb0294.tar.lz marcuscom-ports-345c511d60252ac2f514d1d2f5802e8f27eb0294.tar.xz marcuscom-ports-345c511d60252ac2f514d1d2f5802e8f27eb0294.tar.zst marcuscom-ports-345c511d60252ac2f514d1d2f5802e8f27eb0294.zip | |
Update to 2.27.4.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@12444 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'security/gnome-keyring/files')
| -rw-r--r-- | security/gnome-keyring/files/patch-pam_gkr-pam-client.c | 18 | ||||
| -rw-r--r-- | security/gnome-keyring/files/patch-pam_gkr-pam-module.c | 24 |
2 files changed, 42 insertions, 0 deletions
diff --git a/security/gnome-keyring/files/patch-pam_gkr-pam-client.c b/security/gnome-keyring/files/patch-pam_gkr-pam-client.c new file mode 100644 index 000000000..05a0306e6 --- /dev/null +++ b/security/gnome-keyring/files/patch-pam_gkr-pam-client.c @@ -0,0 +1,18 @@ +--- pam/gkr-pam-client.c.orig 2008-10-07 12:25:23.000000000 -0400 ++++ pam/gkr-pam-client.c 2008-10-07 12:38:36.000000000 -0400 +@@ -96,12 +96,12 @@ check_peer_same_uid (int sock) + struct xucred xuc; + socklen_t xuc_len = sizeof (xuc); + +- if (getsockopt (sock, SOL_SOCKET, LOCAL_PEERCRED, &xuc, &xuc_len) == 0 && +- xuc_len == sizeof (xuc)) { ++ if (getsockopt (sock, 0, LOCAL_PEERCRED, &xuc, &xuc_len) == 0 && ++ xuc.cr_version == XUCRED_VERSION) { + uid = xuc.cr_uid; + } else { + syslog (GKR_LOG_ERR, "could not get gnome-keyring-daemon socket credentials, " +- "(returned len %d/%d)\n", xuc_len, (int)sizeof (xuc)); ++ "(returned version %d/%d)\n", xuc.cr_version, XUCRED_VERSION); + return -1; + } + diff --git a/security/gnome-keyring/files/patch-pam_gkr-pam-module.c b/security/gnome-keyring/files/patch-pam_gkr-pam-module.c new file mode 100644 index 000000000..1b3add92d --- /dev/null +++ b/security/gnome-keyring/files/patch-pam_gkr-pam-module.c @@ -0,0 +1,24 @@ +--- pam/gkr-pam-module.c.orig 2009-07-09 04:01:56.000000000 +0200 ++++ pam/gkr-pam-module.c 2009-07-18 22:17:40.000000000 +0200 +@@ -229,8 +229,10 @@ evaluate_inlist (const char *needle, con + const char *item; + const char *remaining; + ++#if defined(PAM_BAD_ITEM) + if (!needle) + return PAM_BAD_ITEM; ++#endif + + remaining = haystack; + +@@ -255,7 +257,10 @@ evaluate_inlist (const char *needle, con + ++remaining; + } + ++#if defined(PAM_BAD_ITEM) + return PAM_BAD_ITEM; ++#endif ++ + } + + /* ----------------------------------------------------------------------------- |