useradd: respect -r flag when allocating subuids

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>

diff --git a/src/useradd.c b/src/useradd.c
index 8573c5a856ccffa3f9b8ed5caa190846496ab566..fefa234cb8be6ed940aaf853bb4ca0ada98fc582 100644 (file)
--- a/src/useradd.c
+++ b/src/useradd.c
@@ -2026,6 +2026,9 @@ int main (int argc, char **argv)
 #ifdef SHADOWGRP
        is_shadow_grp = sgr_file_present ();
 #endif
+
+       process_flags (argc, argv);
+
 #ifdef ENABLE_SUBIDS
        is_sub_uid = sub_uid_file_present () && !rflg &&
            (!user_id || (user_id <= uid_max && user_id >= uid_min));
@@ -2035,8 +2038,6 @@ int main (int argc, char **argv)
 
        get_defaults ();
 
-       process_flags (argc, argv);
-
 #ifdef ACCT_TOOLS_SETUID
 #ifdef USE_PAM
        {