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

Fri Sep 30 14:44:16 UTC 2005

Author: bubulle
Date: 2005-09-30 14:44:15 +0000 (Fri, 30 Sep 2005)
New Revision: 549

Modified:
   trunk/debian/changelog
   trunk/debian/control
   trunk/debian/login.defs
   trunk/debian/login.pam
   trunk/debian/login.su.pam
Log:
More accurate comments in login.defs about MAIL_DIR and MAIL_FILE
Use pam_mail in login and su and add comment about this over there

Go through both Replaces lines and version the ones we can.


Modified: trunk/debian/changelog
===================================================================

--- trunk/debian/changelog	2005-09-30 09:16:33 UTC (rev 548)
+++ trunk/debian/changelog	2005-09-30 14:44:15 UTC (rev 549)
@@ -6,10 +6,18 @@
       More accurate Replaces lines for manpages-* packages which have
       been fixed:
       - manpages-ru
+      - manpages-fr
     - debian/login.pam, debian/login.su.pam:
       - use "readenv=1" with pam_env so that /etc/environment settings are
         used. Thanks to Konrad Jelen for pointing it
+      - use "pam_mail" for login and su to display the user's new mail status
+        (for login only) and set the MAIL environment variable
+	Add a comment about the need to *also* define MAIL_DIR and possibly
+	MAIL_FILE in /etc/login.defs so that userdel behaves properly
+	Closes: #330420
     - Really add /etc/pam.d/passwd. Closes: #330870
+    - debian/login.defs:
+      Better document the real and future use of MAIL_DIR and MAIL_FILE
   * Upstream bugs not already fixed in upstream releases or CVS:
     - 451_login_PATH: set PATH according to ENV_SUPATH and ENV_PATH for login
       Closes: #330803

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2005-09-30 09:16:33 UTC (rev 548)
+++ trunk/debian/control	2005-09-30 14:44:15 UTC (rev 549)
@@ -10,7 +10,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${loginpam}
 Conflicts: shadow-passwd, pam-apps, suidregister (<< 0.50), debconf (<< 0.5)
-Replaces: manpages (<=1.15-2), manpages-de, manpages-fr, manpages-hu, manpages-it, manpages-ja, manpages-ko, manpages-pl (<= 20020406-1), manpages-es-extra, manpages-ru (<< 0.98-3),manpages-zh, manpages-tr, manpages-fi, manpages-pt
+Replaces: manpages (<=1.15-2), manpages-de, manpages-fr (<<1.64.0-1), manpages-hu, manpages-it, manpages-ja, manpages-ko, manpages-pl (<= 20020406-1), manpages-es-extra, manpages-ru (<< 0.98-3),manpages-zh, manpages-tr, manpages-fi, manpages-pt
 Section: admin
 Priority: required
 Description: change and administer password and group data
@@ -24,7 +24,7 @@
 Pre-Depends: ${shlibs:Depends}, libpam-runtime (>= 0.76-14)
 Depends: libpam-modules (>= 0.72-5)
 Conflicts: shadow-login, pam-apps, secure-su, suidregister (<< 0.50)
-Replaces: shadow-login, shadow-passwd, shellutils (<< 2.0-2), manpages-fr, manpages-hu, manpages-it, manpages-ko, manpages-ja, manpages-pl (<= 20020406-1), manpages-de, manpages-es-extra, manpages-tr, manpages-zh, manpages-fi
+Replaces: shadow-login, shadow-passwd, shellutils (<< 2.0-2), manpages-fr (<<1.64.0-1), manpages-hu, manpages-it, manpages-ko, manpages-ja, manpages-pl (<= 20020406-1), manpages-de, manpages-es-extra, manpages-tr, manpages-zh, manpages-fi
 Essential: yes
 Section: admin
 Priority: required

Modified: trunk/debian/login.defs
===================================================================
--- trunk/debian/login.defs	2005-09-30 09:16:33 UTC (rev 548)
+++ trunk/debian/login.defs	2005-09-30 14:44:15 UTC (rev 549)
@@ -10,27 +10,28 @@
 #
 # Modified for Linux.  --marekm
 
-#
-# *REQUIRED*
+# REQUIRED for useradd/userdel/usermdo
 #   Directory where mailboxes reside, _or_ name of file, relative to the
 #   home directory.  If you _do_ define MAIL_DIR and MAIL_FILE,
 #   MAIL_DIR takes precedence.
 #
 #   Essentially:
-#      - MAIL_DIR defines the $MAIL environmental variable
+#      - MAIL_DIR defines the location of users mail spool files
 #        (for mbox use) by appending the username to MAIL_DIR as defined
-#        below.  
-#      - MAIL_FILE defines the $MAIL environment variable as the
+#        below.
+#      - MAIL_FILE defines the location of the users mail spool files as the
 #        fully-qualified filename obtained by prepending the user home
 #        directory before $MAIL_FILE
 #
-# NOTE: This is used to setup your MAIL environment variable, and also
-# used by userdel to determine if any mail spools need to be removed when
-# removing a user. If you change this, you should also change the
-# pam_mail.so module setup in /etc/pam.d/login, which affects the "You
-# have mail" message on login, and, in default setup, overrides this setting
-# in determining the $MAIL environmental variable.
-# 
+# NOTE: This is no more used for setting up users MAIL environment variable
+#       which is, starting from shadow 4.0.12-1 in Debian, entirely the
+#       job of the pam_mail PAM modules
+#       See default PAM configuration files provided for
+#       login, su, etc.
+#
+# This is a temporary situation: setting these variables will soon
+# move to /etc/default/useradd and the variables will then be
+# no more supported
 MAIL_DIR        /var/mail
 #MAIL_FILE      .mail
 

Modified: trunk/debian/login.pam
===================================================================
--- trunk/debian/login.pam	2005-09-30 09:16:33 UTC (rev 548)
+++ trunk/debian/login.pam	2005-09-30 14:44:15 UTC (rev 549)
@@ -59,10 +59,12 @@
 session    optional   pam_motd.so
 
 # Prints the status of the user's mailbox upon succesful login
-# (Replaces the `MAIL_CHECK_ENAB' option from login.defs). You
-# can also enable a MAIL environment variable from here, but it
-# is better handled by /etc/login.defs, since userdel also uses
-# it to make sure that removing a user, also removes their mail
-# spool file.
-session    optional   pam_mail.so standard noenv
+# (Replaces the `MAIL_CHECK_ENAB' option from login.defs). 
+#
+# This also 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 
+# also removes the user's mail spool file.
+# See comments in /etc/login.defs
+session    optional   pam_mail.so standard
 @include common-password

Modified: trunk/debian/login.su.pam
===================================================================
--- trunk/debian/login.su.pam	2005-09-30 09:16:33 UTC (rev 548)
+++ trunk/debian/login.su.pam	2005-09-30 14:44:15 UTC (rev 549)
@@ -40,6 +40,16 @@
 @include common-account
 @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 
+# also removes the user's mail spool file.
+# See comments in /etc/login.defs
+#
+# "nopen" stands to avoid reporting new mail when su'ing to another user
+session    optional   pam_mail.so nopen
+
 # Sets up user limits, please uncomment and read /etc/security/limits.conf
 # to enable this functionality.
 # (Replaces the use of /etc/limits in old login)


