[Pkg-shadow-commits] r884 - trunk/debian

[Christian Perrier]

Author: bubulle
Date: 2006-02-28 07:15:50 +0000 (Tue, 28 Feb 2006)
New Revision: 884

Modified:
   trunk/debian/changelog
   trunk/debian/login.pam
   trunk/debian/login.su.pam
Log:
Move the @include statements at the end of PAM files


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-02-28 01:49:52 UTC (rev 883)
+++ trunk/debian/changelog	2006-02-28 07:15:50 UTC (rev 884)
@@ -3,6 +3,11 @@
   * The "Salers" release
   * Debconf translation updates:
     - Dutch updated. Closes: #354593
+  * Debian packaging fixes:
+    - move the @include statements at the end of pam configuration files.
+      This is of no important with the Debian default common-* files
+      but would lead to unexpected results if the local admin adds
+      "sufficient" lines in these common-* files
 
  -- Christian Perrier <bubulle at debian.org>  Wed, 22 Feb 2006 20:29:52 +0100
 

Modified: trunk/debian/login.pam
===================================================================
--- trunk/debian/login.pam	2006-02-28 01:49:52 UTC (rev 883)
+++ trunk/debian/login.pam	2006-02-28 07:15:50 UTC (rev 884)
@@ -41,10 +41,6 @@
 # (Replaces /etc/login.access file)
 # account  required       pam_access.so
 
-# Standard Un*x account and session
- at include common-account
- at include common-session
-
 # Sets up user limits according to /etc/security/limits.conf
 # (Replaces the use of /etc/limits in old login)
 session    required   pam_limits.so
@@ -66,4 +62,8 @@
 # also removes the user's mail spool file.
 # See comments in /etc/login.defs
 session    optional   pam_mail.so standard
+
+# Standard Un*x account and session
+ at include common-account
+ at include common-session
 @include common-password

Modified: trunk/debian/login.su.pam
===================================================================
--- trunk/debian/login.su.pam	2006-02-28 01:49:52 UTC (rev 883)
+++ trunk/debian/login.su.pam	2006-02-28 07:15:50 UTC (rev 884)
@@ -35,14 +35,6 @@
 # parsing /etc/environment needs "readenv=1"
 session       required   pam_env.so readenv=1
 
-# The standard Unix authentication modules, used with
-# NIS (man nsswitch) as well as normal /etc/passwd and
-# /etc/shadow entries.
- at include common-auth
- at include common-account
- at include common-session
-
-
 # Defines the MAIL environment variable
 # However, userdel also needs MAIL_DIR and MAIL_FILE variables
 # in /etc/login.defs to make sure that removing a user 
@@ -56,3 +48,12 @@
 # to enable this functionality.
 # (Replaces the use of /etc/limits in old login)
 # session    required   pam_limits.so
+
+# The standard Unix authentication modules, used with
+# NIS (man nsswitch) as well as normal /etc/passwd and
+# /etc/shadow entries.
+ at include common-auth
+ at include common-account
+ at include common-session
+
+