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

useradd: respect -r flag when allocating subuids

Browse Source 
We intend to not create subuids for system users. However we are
checking for command line flags after we check whether -r flag
was set, so it was never found to be true.  Fix that.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
This commit is contained in:
Serge Hallyn 2016-02-18 09:20:43 -08:00
parent 9ab9e6f331
commit af064545bf
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/useradd.c
View File

@ -2026,6 +2026,9 @@ int main (int argc, char **argv)
#ifdef SHADOWGRP #ifdef SHADOWGRP
is_shadow_grp = sgr_file_present (); is_shadow_grp = sgr_file_present ();
#endif #endif
process_flags (argc, argv);
#ifdef ENABLE_SUBIDS #ifdef ENABLE_SUBIDS
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));
@ -2035,8 +2038,6 @@ int main (int argc, char **argv)
get_defaults (); get_defaults ();
process_flags (argc, argv);
#ifdef ACCT_TOOLS_SETUID #ifdef ACCT_TOOLS_SETUID
#ifdef USE_PAM #ifdef USE_PAM
{ {