[Pkg-xfce-commits] r7061 - goodies/trunk/lightdm/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2012-06-18 19:05:08 +0000 (Mon, 18 Jun 2012)
New Revision: 7061

Added:
   goodies/trunk/lightdm/debian/lightdm.lightdm-autologin.pam
Modified:
   goodies/trunk/lightdm/debian/changelog
   goodies/trunk/lightdm/debian/lightdm.pam
   goodies/trunk/lightdm/debian/rules
Log:
* debian/lightdm.lightdm-autologin.pam added, support auto-login when
  configured in /etc/lightdm/lightdm.conf.                    closes: #636104
* debian/rules:
  - install both pam files.

Modified: goodies/trunk/lightdm/debian/changelog
===================================================================
--- goodies/trunk/lightdm/debian/changelog	2012-06-18 15:44:27 UTC (rev 7060)
+++ goodies/trunk/lightdm/debian/changelog	2012-06-18 19:05:08 UTC (rev 7061)
@@ -2,6 +2,10 @@
 
   * 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 at debian.org>  Mon, 18 Jun 2012 17:43:57 +0200
 

Added: goodies/trunk/lightdm/debian/lightdm.lightdm-autologin.pam
===================================================================
--- goodies/trunk/lightdm/debian/lightdm.lightdm-autologin.pam	                        (rev 0)
+++ goodies/trunk/lightdm/debian/lightdm.lightdm-autologin.pam	2012-06-18 19:05:08 UTC (rev 7061)
@@ -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
+ at 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
+ at 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
+ at include common-password

Modified: goodies/trunk/lightdm/debian/lightdm.pam
===================================================================
--- goodies/trunk/lightdm/debian/lightdm.pam	2012-06-18 15:44:27 UTC (rev 7060)
+++ goodies/trunk/lightdm/debian/lightdm.pam	2012-06-18 19:05:08 UTC (rev 7061)
@@ -11,14 +11,14 @@
 # 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

Modified: goodies/trunk/lightdm/debian/rules
===================================================================
--- goodies/trunk/lightdm/debian/rules	2012-06-18 15:44:27 UTC (rev 7060)
+++ goodies/trunk/lightdm/debian/rules	2012-06-18 19:05:08 UTC (rev 7061)
@@ -16,6 +16,10 @@
 	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