useradd: Restore defaults used up to 4.8.1 version

Also fix /etc/default/useradd to state that mail spool directories are not created.
2022-02-11 13:14:04 +01:00
parent c9d3bfbed8
commit b96c915fb6
3 changed files with 30 additions and 1 deletions
@@ -33,5 +33,5 @@ SHELL=/bin/sh
 #
 # Defines whether the mail spool should be created while
 # creating the account
-# CREATE_MAIL_SPOOL=yes
+# CREATE_MAIL_SPOOL=no

@@ -0,0 +1,28 @@
+From: Balint Reczey <balint@balintreczey.hu>
+Description: Keep using Debian's adduser defaults
+ Upstream's bbf4b79bc49fd1826eb41f6629669ef0b647267b commit
+ in 4.9 merged those values from upstream's default configuration file
+ which is not shipped in Debian.
+ This patch keeps the program's compiled in defaults in sync with the
+ configuration files shipped in Debian (debian/default/useradd).
+Bug: https://github.com/shadow-maint/shadow/issues/501
+Bug-Debian: https://bugs.debian.org/1004710
+Forwarded: not-needed
+
+--- a/src/useradd.c
+++ b/src/useradd.c
+@@ -79,12 +79,12 @@
+ /*
+  * These defaults are used if there is no defaults file.
+  */
+-static gid_t def_group = 1000;
+static gid_t def_group = 100;
+ static const char *def_gname = "other";
+ static const char *def_home = "/home";
+ static const char *def_shell = "/bin/bash";
+ static const char *def_template = SKEL_DIR;
+-static const char *def_create_mail_spool = "yes";
+static const char *def_create_mail_spool = "no";
+ static const char *def_log_init = "yes";
+ 
+ static long def_inactive = -1;
@@ -2,6 +2,7 @@
 #900_testsuite_groupmems
 #901_testsuite_gcov

+502_debian_useradd_defaults
 503_shadowconfig.8
 008_login_log_failure_in_FTMP
 429_login_FAILLOG_ENAB