8c824a0b04
- reduce the reuse of system IDs - speed up sys users look up on LDAP boxes (#511813) - upgrade
75 lines
3.1 KiB
Diff
75 lines
3.1 KiB
Diff
diff -up shadow-4.1.4/libmisc/find_new_gid.c.redhat shadow-4.1.4/libmisc/find_new_gid.c
|
|
--- shadow-4.1.4/libmisc/find_new_gid.c.redhat 2009-04-23 19:36:42.000000000 +0200
|
|
+++ shadow-4.1.4/libmisc/find_new_gid.c 2009-05-15 12:01:18.000000000 +0200
|
|
@@ -58,11 +58,11 @@ int find_new_gid (bool sys_group,
|
|
assert (gid != NULL);
|
|
|
|
if (!sys_group) {
|
|
- gid_min = (gid_t) getdef_ulong ("GID_MIN", 1000UL);
|
|
+ gid_min = (gid_t) getdef_ulong ("GID_MIN", 500UL);
|
|
gid_max = (gid_t) getdef_ulong ("GID_MAX", 60000UL);
|
|
} else {
|
|
gid_min = (gid_t) getdef_ulong ("SYS_GID_MIN", 1UL);
|
|
- gid_max = (gid_t) getdef_ulong ("GID_MIN", 1000UL) - 1;
|
|
+ gid_max = (gid_t) getdef_ulong ("GID_MIN", 500UL) - 1;
|
|
gid_max = (gid_t) getdef_ulong ("SYS_GID_MAX", (unsigned long) gid_max);
|
|
}
|
|
used_gids = alloca (sizeof (bool) * (gid_max +1));
|
|
diff -up shadow-4.1.4/libmisc/find_new_uid.c.redhat shadow-4.1.4/libmisc/find_new_uid.c
|
|
--- shadow-4.1.4/libmisc/find_new_uid.c.redhat 2009-04-23 19:37:12.000000000 +0200
|
|
+++ shadow-4.1.4/libmisc/find_new_uid.c 2009-05-15 12:01:39.000000000 +0200
|
|
@@ -58,11 +58,11 @@ int find_new_uid (bool sys_user,
|
|
assert (uid != NULL);
|
|
|
|
if (!sys_user) {
|
|
- uid_min = (uid_t) getdef_ulong ("UID_MIN", 1000UL);
|
|
+ uid_min = (uid_t) getdef_ulong ("UID_MIN", 500UL);
|
|
uid_max = (uid_t) getdef_ulong ("UID_MAX", 60000UL);
|
|
} else {
|
|
uid_min = (uid_t) getdef_ulong ("SYS_UID_MIN", 1UL);
|
|
- uid_max = (uid_t) getdef_ulong ("UID_MIN", 1000UL) - 1;
|
|
+ uid_max = (uid_t) getdef_ulong ("UID_MIN", 500UL) - 1;
|
|
uid_max = (uid_t) getdef_ulong ("SYS_UID_MAX", (unsigned long) uid_max);
|
|
}
|
|
used_uids = alloca (sizeof (bool) * (uid_max +1));
|
|
diff -up shadow-4.1.4/src/useradd.c.redhat shadow-4.1.4/src/useradd.c
|
|
--- shadow-4.1.4/src/useradd.c.redhat 2009-05-10 20:26:35.000000000 +0200
|
|
+++ shadow-4.1.4/src/useradd.c 2009-05-15 11:59:40.000000000 +0200
|
|
@@ -90,7 +90,7 @@ char *Prog;
|
|
static gid_t def_group = 100;
|
|
static const char *def_gname = "other";
|
|
static const char *def_home = "/home";
|
|
-static const char *def_shell = "";
|
|
+static const char *def_shell = "/sbin/nologin";
|
|
static const char *def_template = SKEL_DIR;
|
|
static const char *def_create_mail_spool = "no";
|
|
|
|
@@ -102,7 +102,7 @@ static char def_file[] = USER_DEFAULTS_F
|
|
#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 = "";
|
|
@@ -996,9 +996,9 @@ static void process_flags (int argc, cha
|
|
};
|
|
while ((c = getopt_long (argc, argv,
|
|
#ifdef WITH_SELINUX
|
|
- "b:c:d:De:f:g:G:k:K:lmMNop:rs:u:UZ:",
|
|
+ "b:c:d:De:f:g:G:k:K:lmMnNop:rs:u:UZ:",
|
|
#else
|
|
- "b:c:d:De:f:g:G:k:K:lmMNop:rs:u:U",
|
|
+ "b:c:d:De:f:g:G:k:K:lmMnNop:rs:u:U",
|
|
#endif
|
|
long_options, NULL)) != -1) {
|
|
switch (c) {
|
|
@@ -1148,6 +1148,7 @@ static void process_flags (int argc, cha
|
|
case 'M':
|
|
Mflg = true;
|
|
break;
|
|
+ case 'n':
|
|
case 'N':
|
|
Nflg = true;
|
|
break;
|