useradd: Correctly set subuid/subgid when using -F

The -F flag should bypass the UID check and always add entries
to the sub[ud]id while the -r flag should still be used in
addition with the UID check.

Closes: <#1255>
Signed-off-by: ndostert <[email protected]>

Author: ndostert

src/useradd.c

@@ -2511,12 +2511,10 @@ int main (int argc, char **argv)
 	subgid_count = getdef_ulong ("SUB_GID_COUNT", 65536);
 	is_sub_uid = want_subuid_file () &&
 	    subuid_count > 0 && sub_uid_file_present () &&
-	    (!rflg || Fflg) &&
-	    (!user_id || (user_id <= uid_max && user_id >= uid_min));
+	    (!rflg && (!user_id || (user_id <= uid_max && user_id >= uid_min))) || Fflg;
 	is_sub_gid = want_subgid_file() &&
 	    subgid_count > 0 && sub_gid_file_present() &&
-	    (!rflg || Fflg) &&
-	    (!user_id || (user_id <= uid_max && user_id >= uid_min));
+	    (!rflg && (!user_id || (user_id <= uid_max && user_id >= uid_min))) || Fflg;
 #endif				/* ENABLE_SUBIDS */
 
 	if (run_parts ("/etc/shadow-maint/useradd-pre.d", user_name,