From 1619b9aaf8892d1d7c5f2ad9548eaad336dd0d2f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Sun, 10 Jun 2012 12:31:08 +0000 Subject: [PATCH] - add updated pam-fingerprint (currently ck session not inited with it) Changed files: gdm-fingerprint.pamd -> 1.1 gdm.pamd -> 1.14 gdm.spec -> 1.303 --- gdm-fingerprint.pamd | 16 ++++++++++++++++ gdm.pamd | 2 +- gdm.spec | 7 +++++-- 3 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 gdm-fingerprint.pamd diff --git a/gdm-fingerprint.pamd b/gdm-fingerprint.pamd new file mode 100644 index 0000000..ec07906 --- /dev/null +++ b/gdm-fingerprint.pamd @@ -0,0 +1,16 @@ +#%PAM-1.0 +auth required pam_listfile.so item=user sense=deny file=/etc/security/blacklist.gdm onerr=succeed +auth include system-auth +auth optional pam_gnome_keyring.so try_first_pass + +account required pam_shells.so +account required pam_nologin.so +account required pam_access.so +account include system-auth + +password required pam_deny.so + +session optional pam_keyinit.so force revoke +session optional pam_console.so +session optional pam_gnome_keyring.so auto_start +session include system-auth diff --git a/gdm.pamd b/gdm.pamd index 01dffa2..d79bf81 100644 --- a/gdm.pamd +++ b/gdm.pamd @@ -5,7 +5,7 @@ auth optional pam_gnome_keyring.so try_first_pass account required pam_shells.so account required pam_nologin.so -account required pam_access.so +account required pam_access.so account include system-auth password include system-auth diff --git a/gdm.spec b/gdm.spec index bcf3e07..ecbae60 100644 --- a/gdm.spec +++ b/gdm.spec @@ -1,7 +1,8 @@ # # TODO: # - s=/dev/null=/home/services/xdm= in %%trigger for graceful upgrade from xdm/kdm/gdm 2.2 -# - check /etc/pam.d/gdm-autologin +# - check all /etc/pam.d/gdm-* to be pldized: +# gdm[1] gdm-autologin[4] gdm-fingerprint[11] gdm-password[1] gdm-smartcard gdm-welcome # # Conditional build: %bcond_without selinux # without selinux @@ -16,7 +17,7 @@ Summary(ru.UTF-8): Дисплейный менеджер GNOME Summary(uk.UTF-8): Дисплейний менеджер GNOME Name: gdm Version: 3.4.1 -Release: 2 +Release: 3 Epoch: 2 License: GPL/LGPL Group: X11/Applications @@ -30,6 +31,7 @@ Source5: %{name}-custom.desktop Source6: %{name}-default.desktop Source7: %{name}.upstart Source9: %{name}.tmpfiles +Source10: %{name}-fingerprint.pamd Patch0: %{name}-xdmcp.patch Patch1: %{name}-polkit.patch Patch2: %{name}-xsession.patch @@ -260,6 +262,7 @@ install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,security,init} \ cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/gdm cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/gdm-password +cp -p %{SOURCE10} $RPM_BUILD_ROOT/etc/pam.d/gdm-fingerprint cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/pam.d/gdm-autologin install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/gdm cp -p %{SOURCE7} $RPM_BUILD_ROOT/etc/init/%{name}.conf -- 2.44.0