From: Micah Anderson <micah@riseup.net>
Date: Wed, 18 Jan 2017 17:06:05 +0000 (+0100)
Subject: Last bits of enabling subuids
X-Git-Tag: 4.5~14^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=578d495f91af8dc5dd774d4310ca06f7013712e7;p=shadow

Last bits of enabling subuids

This patch has been carried by Debian, originally
submitted to BTS in #739981
---

diff --git a/src/newusers.c b/src/newusers.c
index 724cbb40..0c0cfe40 100644
--- a/src/newusers.c
+++ b/src/newusers.c
@@ -988,8 +988,8 @@ int main (int argc, char **argv)
 	is_shadow_grp = sgr_file_present ();
 #endif
 #ifdef ENABLE_SUBIDS
-	is_sub_uid = sub_uid_file_present ();
-	is_sub_gid = sub_gid_file_present ();
+	is_sub_uid = sub_uid_file_present () && !rflg;
+	is_sub_gid = sub_gid_file_present () && !rflg;
 #endif				/* ENABLE_SUBIDS */
 
 	open_files ();