diff options
| author | Ray Strode <rstrode@redhat.com> | 2011-10-18 21:01:15 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2011-10-18 21:16:48 -0400 |
| commit | 0e0aca600da17cb952525617f79ee3cadc028a8a (patch) | |
| tree | 021fd9e9d8c6321d6bbdf826c83ad22a2c6a73c1 /gui | |
| parent | 25004e4d11bbd2e8a22d5bcf49f294e9f63d2ce5 (diff) | |
| download | gdm-0e0aca600da17cb952525617f79ee3cadc028a8a.tar.gz | |
data: move fingerprint/smartcard pam files to common data
The non-fallback greeter uses them, too, so they shouldn't
be in the fallback greeter source directories.
https://bugzilla.gnome.org/show_bug.cgi?id=660491
Diffstat (limited to 'gui')
5 files changed, 2 insertions, 70 deletions
diff --git a/gui/simple-greeter/extensions/fingerprint/Makefile.am b/gui/simple-greeter/extensions/fingerprint/Makefile.am index e263e15f..3466c87d 100644 --- a/gui/simple-greeter/extensions/fingerprint/Makefile.am +++ b/gui/simple-greeter/extensions/fingerprint/Makefile.am @@ -39,16 +39,8 @@ libfingerprint_la_SOURCES = \ gdm-fingerprint-extension.h \ gdm-fingerprint-extension.c -$(PAM_SERVICE_NAME): $(PAM_SERVICE_NAME).pam - cp $(srcdir)/$(PAM_SERVICE_NAME).pam $(builddir)/$(PAM_SERVICE_NAME) - -pamdir = $(PAM_PREFIX)/pam.d -pam_DATA = $(PAM_SERVICE_NAME) - -EXTRA_DIST = $(extension_DATA) $(gsettings_SCHEMAS) $(PAM_SERVICE_NAME).pam -CLEANFILES = $(PAM_SERVICE_NAME) +EXTRA_DIST = $(extension_DATA) $(gsettings_SCHEMAS) MAINTAINERCLEANFILES = \ *~ \ - $(PAM_SERVICE_NAME) \ Makefile.in diff --git a/gui/simple-greeter/extensions/fingerprint/gdm-fingerprint b/gui/simple-greeter/extensions/fingerprint/gdm-fingerprint deleted file mode 100644 index 1a1c7772..00000000 --- a/gui/simple-greeter/extensions/fingerprint/gdm-fingerprint +++ /dev/null @@ -1,17 +0,0 @@ -# Sample PAM file for doing fingerprint authentication. -# Distros should replace this with what makes sense for them. -auth required pam_env.so -auth required pam_fprintd.so -auth sufficient pam_succeed_if.so uid >= 500 quiet -auth required pam_deny.so - -account required pam_unix.so -account sufficient pam_localuser.so -account sufficient pam_succeed_if.so uid < 500 quiet -account required pam_permit.so - -password required pam_deny.so - -session optional pam_keyinit.so revoke -session required pam_limits.so -session required pam_unix.so diff --git a/gui/simple-greeter/extensions/fingerprint/gdm-fingerprint.pam b/gui/simple-greeter/extensions/fingerprint/gdm-fingerprint.pam deleted file mode 100644 index 1a1c7772..00000000 --- a/gui/simple-greeter/extensions/fingerprint/gdm-fingerprint.pam +++ /dev/null @@ -1,17 +0,0 @@ -# Sample PAM file for doing fingerprint authentication. -# Distros should replace this with what makes sense for them. -auth required pam_env.so -auth required pam_fprintd.so -auth sufficient pam_succeed_if.so uid >= 500 quiet -auth required pam_deny.so - -account required pam_unix.so -account sufficient pam_localuser.so -account sufficient pam_succeed_if.so uid < 500 quiet -account required pam_permit.so - -password required pam_deny.so - -session optional pam_keyinit.so revoke -session required pam_limits.so -session required pam_unix.so diff --git a/gui/simple-greeter/extensions/smartcard/Makefile.am b/gui/simple-greeter/extensions/smartcard/Makefile.am index 695ce138..d749cf9c 100644 --- a/gui/simple-greeter/extensions/smartcard/Makefile.am +++ b/gui/simple-greeter/extensions/smartcard/Makefile.am @@ -59,16 +59,8 @@ gdm_smartcard_worker_SOURCES = \ gdm-smartcard-worker.c \ $(NULL) -$(PAM_SERVICE_NAME): $(PAM_SERVICE_NAME).pam - cp $(srcdir)/$(PAM_SERVICE_NAME).pam $(builddir)/$(PAM_SERVICE_NAME) - -pamdir = $(PAM_PREFIX)/pam.d -pam_DATA = $(PAM_SERVICE_NAME) - -EXTRA_DIST = $(extension_DATA) $(PAM_SERVICE_NAME).pam -CLEANFILES = $(PAM_SERVICE_NAME) +EXTRA_DIST = $(extension_DATA) MAINTAINERCLEANFILES = \ *~ \ - $(PAM_SERVICE_NAME) \ Makefile.in diff --git a/gui/simple-greeter/extensions/smartcard/gdm-smartcard.pam b/gui/simple-greeter/extensions/smartcard/gdm-smartcard.pam deleted file mode 100644 index d5ac1fab..00000000 --- a/gui/simple-greeter/extensions/smartcard/gdm-smartcard.pam +++ /dev/null @@ -1,18 +0,0 @@ -# Sample PAM file for doing smartcard authentication. -# Distros should replace this with what makes sense for them. -auth required pam_env.so -auth [success=done ignore=ignore default=die] pam_pkcs11.so wait_for_card card_only -auth requisite pam_succeed_if.so uid >= 500 quiet -auth required pam_deny.so - -account required pam_unix.so -account sufficient pam_localuser.so -account sufficient pam_succeed_if.so uid < 500 quiet -account required pam_permit.so - -password optional pam_pkcs11.so -password requisite pam_cracklib.so try_first_pass retry=3 type= - -session optional pam_keyinit.so revoke -session required pam_limits.so -session required pam_unix.so |