94f04f9e71
usermod: allow all group types with -G option (#1975327) Clean spec file Signed-off-by: Iker Pedrosa <ipedrosa@redhat.com>
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
diff -up shadow-4.9/src/useradd.c.redhat shadow-4.9/src/useradd.c
|
|
--- shadow-4.9/src/useradd.c.redhat 2021-07-22 23:55:35.000000000 +0200
|
|
+++ shadow-4.9/src/useradd.c 2021-08-02 11:45:11.942867250 +0200
|
|
@@ -104,7 +104,7 @@ FILE *shadow_logfd = NULL;
|
|
static gid_t def_group = 1000;
|
|
static const char *def_gname = "other";
|
|
static const char *def_home = "/home";
|
|
-static const char *def_shell = "/bin/bash";
|
|
+static const char *def_shell = "/sbin/nologin";
|
|
static const char *def_template = SKEL_DIR;
|
|
static const char *def_create_mail_spool = "yes";
|
|
|
|
@@ -114,7 +114,7 @@ static const char *def_expire = "";
|
|
#define VALID(s) (strcspn (s, ":\n") == strlen (s))
|
|
|
|
static const char *user_name = "";
|
|
-static const char *user_pass = "!";
|
|
+static const char *user_pass = "!!";
|
|
static uid_t user_id;
|
|
static gid_t user_gid;
|
|
static const char *user_comment = "";
|
|
@@ -1204,9 +1204,9 @@ static void process_flags (int argc, cha
|
|
};
|
|
while ((c = getopt_long (argc, argv,
|
|
#ifdef WITH_SELINUX
|
|
- "b:c:d:De:f:g:G:hk:K:lmMNop:rR:P:s:u:UZ:",
|
|
+ "b:c:d:De:f:g:G:hk:K:lmMnNop:rR:P:s:u:UZ:",
|
|
#else /* !WITH_SELINUX */
|
|
- "b:c:d:De:f:g:G:hk:K:lmMNop:rR:P:s:u:U",
|
|
+ "b:c:d:De:f:g:G:hk:K:lmMnNop:rR:P:s:u:U",
|
|
#endif /* !WITH_SELINUX */
|
|
long_options, NULL)) != -1) {
|
|
switch (c) {
|
|
@@ -1363,6 +1363,7 @@ static void process_flags (int argc, cha
|
|
case 'M':
|
|
Mflg = true;
|
|
break;
|
|
+ case 'n':
|
|
case 'N':
|
|
Nflg = true;
|
|
break;
|