From: Serge Hallyn <serge@hallyn.com>
Date: Sun, 5 Dec 2021 04:26:51 +0000 (-0600)
Subject: Merge pull request #231 from gjzkrug/useradd-maildir-fix
X-Git-Tag: 4.10~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19f08785f0fff2f8c48fe36b3edd9ab997964423;p=thirdparty%2Fshadow.git

Merge pull request #231 from gjzkrug/useradd-maildir-fix

Removed hard-coded default mail spool in useradd
---

19f08785f0fff2f8c48fe36b3edd9ab997964423
diff --cc src/useradd.c
index 16447671c,62c743795..3eec17787
--- a/src/useradd.c
+++ b/src/useradd.c
@@@ -2356,11 -2203,16 +2356,16 @@@ 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])
 +		if (prefix[0])
  			sprintf (file, "%s/%s/%s", prefix, spool, user_name);
  		else
  			sprintf (file, "%s/%s", spool, user_name);