Merge pull request #299 from lnussel/master

useradd: use built-in settings by default
This commit is contained in:
Serge Hallyn 2020-12-27 00:26:47 -06:00 committed by GitHub
commit 1021195bfe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 13 deletions

View File

@ -4,8 +4,7 @@
sysconf_DATA = login.defs
defaultdir = $(sysconfdir)/default
default_DATA = \
useradd
default_DATA =
nonpam_files = \
limits \

View File

@ -1,8 +0,0 @@
# useradd defaults file
GROUP=1000
HOME=/home
INACTIVE=-1
EXPIRE=
SHELL=/bin/bash
SKEL=/etc/skel
CREATE_MAIL_SPOOL=yes

View File

@ -97,12 +97,12 @@ const char *Prog;
/*
* These defaults are used if there is no defaults file.
*/
static gid_t def_group = 100;
static gid_t def_group = 1000;
static const char *def_gname = "other";
static const char *def_home = "/home";
static const char *def_shell = "";
static const char *def_shell = "/bin/bash";
static const char *def_template = SKEL_DIR;
static const char *def_create_mail_spool = "no";
static const char *def_create_mail_spool = "yes";
static long def_inactive = -1;
static const char *def_expire = "";