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 | |
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
-rw-r--r-- | data/Makefile.am | 15 | ||||
-rw-r--r-- | data/gdm-fingerprint.pam (renamed from gui/simple-greeter/extensions/fingerprint/gdm-fingerprint.pam) | 0 | ||||
-rw-r--r-- | data/gdm-smartcard.pam (renamed from gui/simple-greeter/extensions/smartcard/gdm-smartcard.pam) | 0 | ||||
-rw-r--r-- | gui/simple-greeter/extensions/fingerprint/Makefile.am | 10 | ||||
-rw-r--r-- | gui/simple-greeter/extensions/fingerprint/gdm-fingerprint | 17 | ||||
-rw-r--r-- | gui/simple-greeter/extensions/smartcard/Makefile.am | 10 |
6 files changed, 17 insertions, 35 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index c9b2d749..7488ed38 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -94,6 +94,15 @@ settings_DATA = $(srcdir)/upstream-settings dconfthingdir = $(libexecdir) dconfthing_SCRIPTS = $(srcdir)/gdm-update-dconf-db +gdm-fingerprint: gdm-fingerprint.pam + cp $(srcdir)/gdm-fingerprint.pam $(builddir)/gdm-fingerprint + +gdm-smartcard: gdm-smartcard.pam + cp $(srcdir)/gdm-smartcard.pam $(builddir)/gdm-smartcard + +pamdir = $(PAM_PREFIX)/pam.d +pam_DATA = gdm-fingerprint gdm-smartcard + EXTRA_DIST = \ $(schemas_in_files) \ $(schemas_DATA) \ @@ -105,6 +114,8 @@ EXTRA_DIST = \ gdm \ gdm-autologin \ gdm-welcome \ + gdm-fingerprint.pam \ + gdm-smartcard.pam \ gdm-fallback.session \ Init.in \ PreSession.in \ @@ -126,6 +137,8 @@ CLEANFILES = \ PreSession \ PostSession \ $(gsettings_SCHEMAS) \ + gdm-fingerprint \ + gdm-smartcard \ $(NULL) DISTCLEANFILES = \ @@ -136,6 +149,8 @@ DISTCLEANFILES = \ MAINTAINERCLEANFILES = \ *~ \ + gdm-fingerprint \ + gdm-smartcard \ Makefile.in 00-upstream-settings 00-upstream-settings-locks: $(srcdir)/gdm-update-dconf-db diff --git a/gui/simple-greeter/extensions/fingerprint/gdm-fingerprint.pam b/data/gdm-fingerprint.pam index 1a1c7772..1a1c7772 100644 --- a/gui/simple-greeter/extensions/fingerprint/gdm-fingerprint.pam +++ b/data/gdm-fingerprint.pam diff --git a/gui/simple-greeter/extensions/smartcard/gdm-smartcard.pam b/data/gdm-smartcard.pam index d5ac1fab..d5ac1fab 100644 --- a/gui/simple-greeter/extensions/smartcard/gdm-smartcard.pam +++ b/data/gdm-smartcard.pam 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/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 |