25899fefb0
- unlock also passwords locked with passwd -l - prevent breaking user entry by entering a password containing colon - fix possible DoS when locking the database files for update - properly use login.defs from the chroot in useradd
24 lines
882 B
Diff
24 lines
882 B
Diff
diff -up shadow-4.2.1/src/useradd.c.defs-chroot shadow-4.2.1/src/useradd.c
|
|
--- shadow-4.2.1/src/useradd.c.defs-chroot 2014-12-01 15:14:58.000000000 +0100
|
|
+++ shadow-4.2.1/src/useradd.c 2015-08-27 15:46:21.935698862 +0200
|
|
@@ -1938,8 +1938,8 @@ int main (int argc, char **argv)
|
|
#endif /* ACCT_TOOLS_SETUID */
|
|
|
|
/* Needed for userns check */
|
|
- uid_t uid_min = (uid_t) getdef_ulong ("UID_MIN", 1000UL);
|
|
- uid_t uid_max = (uid_t) getdef_ulong ("UID_MAX", 60000UL);
|
|
+ uid_t uid_min;
|
|
+ uid_t uid_max;
|
|
|
|
/*
|
|
* Get my name so that I can use it to report errors.
|
|
@@ -1957,6 +1957,9 @@ int main (int argc, char **argv)
|
|
audit_help_open ();
|
|
#endif
|
|
|
|
+ uid_min = (uid_t) getdef_ulong ("UID_MIN", 1000UL);
|
|
+ uid_max = (uid_t) getdef_ulong ("UID_MAX", 60000UL);
|
|
+
|
|
sys_ngroups = sysconf (_SC_NGROUPS_MAX);
|
|
user_groups = (char **) xmalloc ((1 + sys_ngroups) * sizeof (char *));
|
|
/*
|