[Pkg-shadow-commits] r2390 - in debian/trunk/debian: . patches

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-09-13 17:27:12 +0000 (Sat, 13 Sep 2008)
New Revision: 2390

Removed:
   debian/trunk/debian/patches/454_userdel_no_MAIL_FILE
Modified:
   debian/trunk/debian/changelog
Log:
  * debian/patches/454_userdel_no_MAIL_FILE: Patch removed. If MAIL_FILE is
    defined, the mailbox is not in MAIL_SPOOL_DIR.


Modified: debian/trunk/debian/changelog
===================================================================
--- debian/trunk/debian/changelog	2008-09-13 17:24:05 UTC (rev 2389)
+++ debian/trunk/debian/changelog	2008-09-13 17:27:12 UTC (rev 2390)
@@ -13,6 +13,8 @@
       + debian/patches/008_login_log_failure_in_FTMP
       + debian/patches/429_login_FAILLOG_ENAB
       + debian/patches/507_32char_grnames.dpatch
+  * debian/patches/454_userdel_no_MAIL_FILE: Patch removed. If MAIL_FILE is
+    defined, the mailbox is not in MAIL_SPOOL_DIR.
   * debian/patches/506_relaxed_usernames: Use an extra paragraph for the note
     on username with a '/'.
   * debian/patches/504_undef_USE_PAM.dpatch:

Deleted: debian/trunk/debian/patches/454_userdel_no_MAIL_FILE
===================================================================
--- debian/trunk/debian/patches/454_userdel_no_MAIL_FILE	2008-09-13 17:24:05 UTC (rev 2389)
+++ debian/trunk/debian/patches/454_userdel_no_MAIL_FILE	2008-09-13 17:27:12 UTC (rev 2390)
@@ -1,21 +0,0 @@
-Goal: do not use MAIL_FILE in userdel:
-      When MAIL_FILE is used, the mail spool is in the home directory, so
-      it do not need to be removed (in addition to the user's home
-      directory)
-
-Note: usermod should be checked also. Maybe MAIL_FILE can be removed from
-      login.defs
-
-Index: shadow-4.1.0/src/userdel.c
-===================================================================
---- shadow-4.1.0.orig/src/userdel.c
-+++ shadow-4.1.0/src/userdel.c
-@@ -566,7 +566,7 @@
- 
- 	maildir = getdef_str ("MAIL_DIR");
- #ifdef MAIL_SPOOL_DIR
--	if (!maildir && !getdef_str ("MAIL_FILE"))
-+	if (!maildir)
- 		maildir = MAIL_SPOOL_DIR;
- #endif
- 	if (!maildir)