Merge pull request #33 from t8m/master

Fix regression in useradd not loading defaults properly.
This commit is contained in:
Serge Hallyn 2016-09-21 09:12:15 -05:00 committed by GitHub
commit 6564241674

View File

@ -2027,6 +2027,8 @@ int main (int argc, char **argv)
is_shadow_grp = sgr_file_present (); is_shadow_grp = sgr_file_present ();
#endif #endif
get_defaults ();
process_flags (argc, argv); process_flags (argc, argv);
#ifdef ENABLE_SUBIDS #ifdef ENABLE_SUBIDS
@ -2036,8 +2038,6 @@ int main (int argc, char **argv)
(!user_id || (user_id <= uid_max && user_id >= uid_min)); (!user_id || (user_id <= uid_max && user_id >= uid_min));
#endif /* ENABLE_SUBIDS */ #endif /* ENABLE_SUBIDS */
get_defaults ();
#ifdef ACCT_TOOLS_SETUID #ifdef ACCT_TOOLS_SETUID
#ifdef USE_PAM #ifdef USE_PAM
{ {