]> granicus.if.org Git - shadow/commitdiff
Last bits of enabling subuids
authorMicah Anderson <micah@riseup.net>
Wed, 18 Jan 2017 17:06:05 +0000 (18:06 +0100)
committerBalint Reczey <balint@balintreczey.hu>
Wed, 18 Jan 2017 17:06:05 +0000 (18:06 +0100)
This patch has been carried by Debian, originally
submitted to BTS in #739981

src/newusers.c

index 724cbb40a7f5307c0507dd8000da8aff685173ef..0c0cfe40e3a845d3e12f800260bb13385ed889e8 100644 (file)
@@ -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 ();