diff --git a/gdm-autologin-pam b/gdm-autologin-pam index 96fcfe3..0616e66 100644 --- a/gdm-autologin-pam +++ b/gdm-autologin-pam @@ -8,6 +8,7 @@ password include system-auth session required pam_selinux.so close session required pam_loginuid.so session optional pam_console.so +-session optional pam_ck_connector.so session required pam_selinux.so open session optional pam_keyinit.so force revoke session required pam_namespace.so diff --git a/gdm-fingerprint.pam b/gdm-fingerprint.pam index 7ff73af..684ac95 100644 --- a/gdm-fingerprint.pam +++ b/gdm-fingerprint.pam @@ -10,6 +10,7 @@ password include fingerprint-auth session required pam_selinux.so close session required pam_loginuid.so session optional pam_console.so +-session optional pam_ck_connector.so session required pam_selinux.so open session optional pam_keyinit.so force revoke session required pam_namespace.so diff --git a/gdm-pam b/gdm-pam index 7bbc7fe..a0027f2 100644 --- a/gdm-pam +++ b/gdm-pam @@ -11,6 +11,7 @@ password include system-auth session required pam_selinux.so close session required pam_loginuid.so session optional pam_console.so +-session optional pam_ck_connector.so session required pam_selinux.so open session optional pam_keyinit.so force revoke session required pam_namespace.so diff --git a/gdm-smartcard.pam b/gdm-smartcard.pam index b80f537..1c8c7b1 100644 --- a/gdm-smartcard.pam +++ b/gdm-smartcard.pam @@ -10,6 +10,7 @@ password include smartcard-auth session required pam_selinux.so close session required pam_loginuid.so session optional pam_console.so +-session optional pam_ck_connector.so session required pam_selinux.so open session optional pam_keyinit.so force revoke session required pam_namespace.so diff --git a/gdm.spec b/gdm.spec index ca70e23..82ac89e 100644 --- a/gdm.spec +++ b/gdm.spec @@ -392,6 +392,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || : %{_libdir}/girepository-1.0/GdmGreeter-1.0.typelib %changelog +* Mon Feb 13 2012 Ray Strode 3.2.1.1-12 +- Restore ConsoleKit registration if ConsoleKit is installed + * Tue Feb 7 2012 Lennart Poettering - 1:3.2.1.1-11 - Add multi-seat patch from gdm git master