rev 3521 - trunk/packages/kdebase/debian

[Christopher Martin]

Author: chrsmrtn
Date: 2006-04-08 23:11:56 +0000 (Sat, 08 Apr 2006)
New Revision: 3521

Modified:
   trunk/packages/kdebase/debian/kcheckpass.pam
   trunk/packages/kdebase/debian/kdm-np.pam
   trunk/packages/kdebase/debian/kdm.pam
   trunk/packages/kdebase/debian/kscreensaver.pam
Log:
Revert frivolous re-ordering, and set pam_env as auth module,
which seems to be correct after all (you think shadow would
have this worked out?).


Modified: trunk/packages/kdebase/debian/kcheckpass.pam
===================================================================
--- trunk/packages/kdebase/debian/kcheckpass.pam	2006-04-08 13:53:48 UTC (rev 3520)
+++ trunk/packages/kdebase/debian/kcheckpass.pam	2006-04-08 23:11:56 UTC (rev 3521)
@@ -3,5 +3,5 @@
 #
 @include common-auth
 @include common-account
+ at include common-password
 @include common-session
- at include common-password

Modified: trunk/packages/kdebase/debian/kdm-np.pam
===================================================================
--- trunk/packages/kdebase/debian/kdm-np.pam	2006-04-08 13:53:48 UTC (rev 3520)
+++ trunk/packages/kdebase/debian/kdm-np.pam	2006-04-08 23:11:56 UTC (rev 3521)
@@ -2,10 +2,10 @@
 # /etc/pam.d/kdm - specify the PAM behaviour of kdm for passwordless logins
 #
 auth       required     pam_nologin.so
-session    required     pam_env.so readenv=1
-session    required     pam_env.so readenv=1 envfile=/etc/default/locale
+auth       required     pam_env.so readenv=1
+auth       required     pam_env.so readenv=1 envfile=/etc/default/locale
 session    required     pam_limits.so
 @include common-account
+ at include common-password
 @include common-session
- at include common-password
 auth       required     pam_permit.so

Modified: trunk/packages/kdebase/debian/kdm.pam
===================================================================
--- trunk/packages/kdebase/debian/kdm.pam	2006-04-08 13:53:48 UTC (rev 3520)
+++ trunk/packages/kdebase/debian/kdm.pam	2006-04-08 23:11:56 UTC (rev 3521)
@@ -2,10 +2,10 @@
 # /etc/pam.d/kdm - specify the PAM behaviour of kdm
 #
 auth       required     pam_nologin.so
-session    required     pam_env.so readenv=1
-session    required     pam_env.so readenv=1 envfile=/etc/default/locale
+auth       required     pam_env.so readenv=1
+auth       required     pam_env.so readenv=1 envfile=/etc/default/locale
 @include common-auth
 session    required     pam_limits.so
 @include common-account
+ at include common-password
 @include common-session
- at include common-password

Modified: trunk/packages/kdebase/debian/kscreensaver.pam
===================================================================
--- trunk/packages/kdebase/debian/kscreensaver.pam	2006-04-08 13:53:48 UTC (rev 3520)
+++ trunk/packages/kdebase/debian/kscreensaver.pam	2006-04-08 23:11:56 UTC (rev 3521)
@@ -3,5 +3,5 @@
 #
 @include common-auth
 @include common-account
+ at include common-password
 @include common-session
- at include common-password