diff options
| author | Balint Reczey <balint@balintreczey.hu> | 2022-02-11 12:30:50 +0100 |
|---|---|---|
| committer | Balint Reczey <balint@balintreczey.hu> | 2022-02-11 13:14:04 +0100 |
| commit | b96c915fb68d3591c56f54b687e87af25579fe73 (patch) | |
| tree | 48395295b8155be1ed981a4923f529addab968be | |
| parent | c9d3bfbed82d4646962428bbf5663eceb3974738 (diff) | |
| download | shadow-b96c915fb68d3591c56f54b687e87af25579fe73.tar.gz | |
useradd: Restore defaults used up to 4.8.1 version
Also fix /etc/default/useradd to state that mail spool directories are
not created.
| -rw-r--r-- | debian/default/useradd | 2 | ||||
| -rw-r--r-- | debian/patches/502_debian_useradd_defaults | 28 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 30 insertions, 1 deletions
diff --git a/debian/default/useradd b/debian/default/useradd index e32955a7..2cb81678 100644 --- a/debian/default/useradd +++ b/debian/default/useradd @@ -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 diff --git a/debian/patches/502_debian_useradd_defaults b/debian/patches/502_debian_useradd_defaults new file mode 100644 index 00000000..9b433811 --- /dev/null +++ b/debian/patches/502_debian_useradd_defaults @@ -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; diff --git a/debian/patches/series b/debian/patches/series index 5ea26270..b25583aa 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -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 |