From: Serge Hallyn <serge.hallyn@ubuntu.com>
Date: Thu, 18 Feb 2016 17:20:43 +0000 (-0800)
Subject: useradd: respect -r flag when allocating subuids
X-Git-Tag: 4.3.0~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=af064545bfa83c9ff5e52f6f2b9e7e2e7aa20138;p=shadow

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 8573c5a8..fefa234c 100644
--- 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
 	{