diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2009-04-24 06:38:26 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2009-04-24 06:38:26 +0000 |
| commit | 84cba0b9274ca2833e503ce816439bff738d2dbe (patch) | |
| tree | 3596d301f3fa56467f67e1819587bba202ec692b /security/gnome-keyring | |
| parent | a16e9e5558ade712858b784dbc230f46acaefecb (diff) | |
| download | ports-84cba0b9274ca2833e503ce816439bff738d2dbe.tar.gz ports-84cba0b9274ca2833e503ce816439bff738d2dbe.zip | |
Notes
Diffstat (limited to 'security/gnome-keyring')
| -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 660c4e7a5449..897f8bd23aa8 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.76 2009/03/15 00:23:43 marcus Exp $ +# $MCom: ports-stable/security/gnome-keyring/Makefile,v 1.3 2009/04/20 00:24:30 marcus Exp $ # PORTNAME= gnome-keyring PORTVERSION= 2.26.1 +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 000000000000..05a0306e6913 --- /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; + } + |