From 70d04c7df0a601dcc1555f7e3fa4ea4b38a70c68 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 30 Nov 2007 15:07:05 +0000 Subject: [PATCH] Make keyring unlocking work --- gdm-pam | 2 +- gdm.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gdm-pam b/gdm-pam index e3efd67..97a3afb 100644 --- a/gdm-pam +++ b/gdm-pam @@ -1,7 +1,7 @@ #%PAM-1.0 auth [success=done ignore=ignore default=bad] pam_selinux_permit.so auth required pam_env.so -auth include system-auth +auth substack system-auth auth optional pam_gnome_keyring.so account required pam_nologin.so account include system-auth diff --git a/gdm.spec b/gdm.spec index ece116e..13929b0 100644 --- a/gdm.spec +++ b/gdm.spec @@ -8,7 +8,7 @@ %define librsvg2_version 2.0.1 %define libxml2_version 2.4.21 %define scrollkeeper_version 0.3.4 -%define pam_version 0.99 +%define pam_version 0.99.8.1-11 %define desktop_file_utils_version 0.2.90 %define gail_version 1.2.0 %define nss_version 3.11.1 @@ -16,7 +16,7 @@ Summary: The GNOME Display Manager Name: gdm Version: 2.21.2 -Release: 0.2007.11.20.3%{?dist} +Release: 0.2007.11.20.4%{?dist} Epoch: 1 License: GPLv2+ Group: User Interface/X @@ -280,6 +280,9 @@ fi %attr(1770, root, gdm) %dir %{_localstatedir}/lib/gdm %changelog +* Fri Nov 30 2007 Matthias Clasen - 1:2.21.2-0.2007.11.20.4 +- Use the new "substack" support in pam to make keyring unlocking work + * Tue Nov 20 2007 Ray Strode - 1:2.21.2-0.2007.11.20.3 - use metacity for now