emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

useradd: Read defaults after changing root directories

Browse Source 
This reverts the behavior of "useradd --root" to using the settings
from login.defs in the target root directory, not the root of the
executed useradd command.
This commit is contained in:
David Michael 2017-02-08 15:48:36 -08:00 committed by Serge Hallyn
parent e36c0a418a
commit c6b0664f52
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/useradd.c
View File

@ -2047,8 +2047,8 @@ int main (int argc, char **argv)
#endif /* ACCT_TOOLS_SETUID */ #endif /* ACCT_TOOLS_SETUID */
#ifdef ENABLE_SUBIDS #ifdef ENABLE_SUBIDS
uid_t uid_min = (uid_t) getdef_ulong ("UID_MIN", 1000UL); uid_t uid_min;
uid_t uid_max = (uid_t) getdef_ulong ("UID_MAX", 60000UL); uid_t uid_max;
#endif #endif
/* /*
@ -2085,6 +2085,8 @@ int main (int argc, char **argv)
process_flags (argc, argv); process_flags (argc, argv);
#ifdef ENABLE_SUBIDS #ifdef ENABLE_SUBIDS
uid_min = (uid_t) getdef_ulong ("UID_MIN", 1000UL);
uid_max = (uid_t) getdef_ulong ("UID_MAX", 60000UL);
is_sub_uid = sub_uid_file_present () && !rflg && is_sub_uid = sub_uid_file_present () && !rflg &&
(!user_id || (user_id <= uid_max && user_id >= uid_min)); (!user_id || (user_id <= uid_max && user_id >= uid_min));
is_sub_gid = sub_gid_file_present () && !rflg && is_sub_gid = sub_gid_file_present () && !rflg &&