Merge upstream 4.2.1

This commit is contained in:
Christian Perrier
2014-05-09 19:14:14 +02:00
parent e1782606c1
commit e56640f2af
75 changed files with 5244 additions and 2534 deletions
+2 -2
View 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 ();