From: Geoffrey Krug <geofkrug@amazon.com>
Date: Wed, 12 Feb 2020 20:21:21 +0000 (+0000)
Subject: Removed hard-coded default mail spool in useradd
X-Git-Tag: 4.10~11^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a991a3ce991f4d253a0b24da4c37d1a702e4ba7;p=thirdparty%2Fshadow.git

Removed hard-coded default mail spool in useradd

The useradd program should be consistent with userdel and usermod and use the
MAIL_SPOOL_DIR variable as the default spool, if it is defined. Otherwise,
don't create a new mailbox, because it won't be cleaned up by userdel when run
with the -r flag.
---

diff --git a/src/useradd.c b/src/useradd.c
index 645d4a40f..62c743795 100644
--- a/src/useradd.c
+++ b/src/useradd.c
@@ -2203,8 +2203,13 @@ static void create_mail (void)
 		mode_t mode;
 
 		spool = getdef_str ("MAIL_DIR");
+#ifdef MAIL_SPOOL_DIR
+		if ((NULL == spool) && (getdef_str ("MAIL_FILE") == NULL)) {
+			spool = MAIL_SPOOL_DIR;
+		}
+#endif /* MAIL_SPOOL_DIR */
 		if (NULL == spool) {
-			spool = "/var/mail";
+			return;
 		}
 		file = alloca (strlen (prefix) + strlen (spool) + strlen (user_name) + 2);
 		if(prefix[0])