* debian/lightdm.lightdm-autologin.pam added, support auto-login when

  configured in /etc/lightdm/lightdm.conf.                    closes: #636104
* debian/rules:
  - install both pam files.

git-svn-id: svn://anonscm.debian.org/pkg-xfce/goodies/trunk/lightdm@7061 0c9b3bff-18ee-0310-b944-d1aa2700132f

diff --git a/debian/changelog b/debian/changelog
index 6f825075b6dfb4e7417ef2c91ca06a3d781fb35f..536bd31b124d9b3b4825c5955c01dfc3e92f2c4b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ lightdm (1.2.2-3) UNRELEASED; urgency=low
 
   * debian/lightdm.pam:
     - enable pam_loginuid.                                      closes: #677435
+  * debian/lightdm.lightdm-autologin.pam added, support auto-login when
+    configured in /etc/lightdm/lightdm.conf.                    closes: #636104
+  * debian/rules:
+    - install both pam files.
 
  -- Yves-Alexis Perez <corsac@debian.org>  Mon, 18 Jun 2012 17:43:57 +0200
 

diff --git a/debian/lightdm.lightdm-autologin.pam b/debian/lightdm.lightdm-autologin.pam
new file mode 100644 (file)
index 0000000..7ca7106
--- /dev/null
+++ b/debian/lightdm.lightdm-autologin.pam
@@ -0,0 +1,25 @@
+#%PAM-1.0
+auth    requisite       pam_nologin.so
+auth    required        pam_env.so readenv=1
+auth    required        pam_env.so readenv=1 envfile=/etc/default/locale
+#auth    sufficient      pam_thinkfinger.so
+auth    required        pam_permit.so
+auth    optional        pam_gnome_keyring.so
+@include common-account
+# SELinux needs to be the first session rule. This ensures that any 
+# lingering context has been cleared. Without out this it is possible 
+# that a module could execute code in the wrong domain.
+# When the module is present, "required" would be sufficient (When SELinux
+# is disabled, this returns success.)
+session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
+session required        pam_limits.so
+session required        pam_loginuid.so
+@include common-session
+# SELinux needs to intervene at login time to ensure that the process
+# starts in the proper default security context. Only sessions which are
+# intended to run in the user's context should be run after this.
+session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
+# When the module is present, "required" would be sufficient (When SELinux
+# is disabled, this returns success.)
+session optional        pam_gnome_keyring.so auto_start
+@include common-password

diff --git a/debian/lightdm.pam b/debian/lightdm.pam
index 40070384bf21d298fdd3f3a7542440963dbbe0dc..79fcd15416d927c9ce6e8e63b033dc53b00d466a 100644 (file)
--- a/debian/lightdm.pam
+++ b/debian/lightdm.pam
@@ -11,14 +11,14 @@ auth    optional        pam_gnome_keyring.so
 # that a module could execute code in the wrong domain.
 # When the module is present, "required" would be sufficient (When SELinux
 # is disabled, this returns success.)
-session [success=ok ignore=ignore module_unknown=ignore default=bad]    pam_selinux.so close
+session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
 session required        pam_limits.so
 session required        pam_loginuid.so
 @include common-session
 # SELinux needs to intervene at login time to ensure that the process
 # starts in the proper default security context. Only sessions which are
 # intended to run in the user's context should be run after this.
-session [success=ok ignore=ignore module_unknown=ignore default=bad]    pam_selinux.so open
+session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
 # When the module is present, "required" would be sufficient (When SELinux
 # is disabled, this returns success.)
 session optional        pam_gnome_keyring.so auto_start

diff --git a/debian/rules b/debian/rules
index 13672b4ec974f00271659f9415ca2d8daf1eb369..c717645205acd23758d01ff054e108ea19ccba0b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,10 @@ override_dh_install:
        rm debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/lightdm/gdmflexiserver
        dh_install --fail-missing
 
+override_dh_installpam:
+               dh_installpam
+               dh_installpam --name=lightdm-autologin
+
 %:
        dh $@ --parallel