VesperOS/shadow
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge upstream 4.2.1

Browse Source
This commit is contained in:
Christian Perrier
2014-05-09 19:14:14 +02:00
parent e1782606c1
commit e56640f2af
75 changed files with 5244 additions and 2534 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/.gitignore
-35
View File
@@ -1,35 +0,0 @@
/chage
/chfn
/chgpasswd
/chpasswd
/chsh
/expiry
/faillog
/gpasswd
/groupadd
/groupdel
/groupmems
/groupmod
/groups
/grpck
/grpconv
/grpunconv
/id
/lastlog
/login
/logoutd
/newgrp
/newgidmap
/newuidmap
/newusers
/nologin
/passwd
/pwck
/pwconv
/pwunconv
/su
/sulogin
/useradd
/userdel
/usermod
/vipw
src/newusers.c
+2 -2
View File
@@ -988,8 +988,8 @@ int main (int argc, char **argv)
is_shadow_grp = sgr_file_present ();
#endif
#ifdef ENABLE_SUBIDS
is_sub_uid = sub_uid_file_present ();
is_sub_gid = sub_gid_file_present ();
is_sub_uid = sub_uid_file_present () && !rflg;
is_sub_gid = sub_gid_file_present () && !rflg;
#endif /* ENABLE_SUBIDS */
open_files ();
src/useradd.c
+8 -2
View File
@@ -1993,6 +1993,10 @@ int main (int argc, char **argv)
#endif /* USE_PAM */
#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);
/*
* Get my name so that I can use it to report errors.
*/
@@ -2022,8 +2026,10 @@ int main (int argc, char **argv)
is_shadow_grp = sgr_file_present ();
#endif
#ifdef ENABLE_SUBIDS
is_sub_uid = sub_uid_file_present ();
is_sub_gid = sub_gid_file_present ();
is_sub_uid = sub_uid_file_present () && !rflg &&
(!user_id || (user_id <= uid_max && user_id >= uid_min));
is_sub_gid = sub_gid_file_present () && !rflg &&
(!user_id || (user_id <= uid_max && user_id >= uid_min));
#endif /* ENABLE_SUBIDS */
get_defaults ();