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

Removed hard-coded default mail spool in useradd

diff --cc src/useradd.c
index 16447671ccfe38d3dc756fac70b70679f00e2486,62c743795fed94e6aa3c00c308ddca286fe54173..3eec17787849d9c118fdd11265120a8b3d1f61fb
--- 1/src/useradd.c
--- 2/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);