emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Removed hard-coded default mail spool in useradd

Browse Source 
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.
This commit is contained in:
Geoffrey Krug 2020-02-12 20:21:21 +00:00
parent 3f2bbcfa91
commit 2a991a3ce9
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/useradd.c
View File

@ -2203,8 +2203,13 @@ static void create_mail (void)
mode_t mode; mode_t mode;
spool = getdef_str ("MAIL_DIR"); 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) { if (NULL == spool) {
spool = "/var/mail"; return;
} }
file = alloca (strlen (prefix) + strlen (spool) + strlen (user_name) + 2); file = alloca (strlen (prefix) + strlen (spool) + strlen (user_name) + 2);
if(prefix[0]) if(prefix[0])