diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-10-08 00:40:48 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-10-08 00:40:48 +0800 |
| commit | 06d5f952b03636f2ce2b5d612f0f2cb94b6755b0 (patch) | |
| tree | 19159a290ee77c21ce03cfa60132585fe34a04b8 | |
| parent | bc07db193d46663ee5053257b526062e85ec752c (diff) | |
| download | marcuscom-ports-06d5f952b03636f2ce2b5d612f0f2cb94b6755b0.tar marcuscom-ports-06d5f952b03636f2ce2b5d612f0f2cb94b6755b0.tar.gz marcuscom-ports-06d5f952b03636f2ce2b5d612f0f2cb94b6755b0.tar.bz2 marcuscom-ports-06d5f952b03636f2ce2b5d612f0f2cb94b6755b0.tar.lz marcuscom-ports-06d5f952b03636f2ce2b5d612f0f2cb94b6755b0.tar.xz marcuscom-ports-06d5f952b03636f2ce2b5d612f0f2cb94b6755b0.tar.zst marcuscom-ports-06d5f952b03636f2ce2b5d612f0f2cb94b6755b0.zip | |
Fix the error:
Oct 7 12:17:28 lasagna pam_helper: could not get gnome-keyring-daemon socket credentials, (returned len 4/88)
Oct 7 12:17:28 lasagna pam_helper: gkr-pam: couldn't unlock 'login' keyring: 255
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11667 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | security/gnome-keyring/Makefile | 3 | ||||
| -rw-r--r-- | security/gnome-keyring/files/patch-pam_gkr-pam-client.c | 18 |
2 files changed, 20 insertions, 1 deletions
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile index 942b74ae5..2380ade9c 100644 --- a/security/gnome-keyring/Makefile +++ b/security/gnome-keyring/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/security/gnome-keyring/Makefile,v 1.67 2008/09/18 16:34:50 mezz Exp $ +# $MCom: ports/security/gnome-keyring/Makefile,v 1.68 2008/09/21 06:40:23 kwm Exp $ # PORTNAME= gnome-keyring PORTVERSION= 2.24.0 +PORTREVISION= 1 CATEGORIES= security gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 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; + } + |