diff options
author | startx2017 <vradu.startx@yandex.com> | 2018-10-17 19:13:16 -0400 |
---|---|---|
committer | startx2017 <vradu.startx@yandex.com> | 2018-10-17 19:13:16 -0400 |
commit | f3a248d5d52357285ee1ae18c86c961d0667b2f8 (patch) | |
tree | 1fa9e33d5ca67492d1f4bc02742109d7700c8d4b /src | |
parent | mainline merge: clean homedir pathname (diff) | |
download | firejail-f3a248d5d52357285ee1ae18c86c961d0667b2f8.tar.gz firejail-f3a248d5d52357285ee1ae18c86c961d0667b2f8.tar.zst firejail-f3a248d5d52357285ee1ae18c86c961d0667b2f8.zip |
mainline merge: fs_whitelist: no warning if macro resolution fails because of missing…
Diffstat (limited to 'src')
-rw-r--r-- | src/firejail/fs_whitelist.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/firejail/fs_whitelist.c b/src/firejail/fs_whitelist.c index 6dd4a7e2d..454715a71 100644 --- a/src/firejail/fs_whitelist.c +++ b/src/firejail/fs_whitelist.c | |||
@@ -371,10 +371,10 @@ void fs_whitelist(void) { | |||
371 | new_name = expand_home(dataptr, cfg.homedir); | 371 | new_name = expand_home(dataptr, cfg.homedir); |
372 | assert(new_name); | 372 | assert(new_name); |
373 | 373 | ||
374 | // skip command if resolving the macro was not successful | 374 | // mount empty home directory if resolving the macro was not successful |
375 | if (is_macro(new_name) && macro_id(new_name) > -1) { | 375 | if (is_macro(new_name) && macro_id(new_name) > -1) { |
376 | // mount empty home directory and print a warning | 376 | // no warning if home does not exist (e.g. in a chroot) |
377 | if (!nowhitelist_flag && !arg_private) { | 377 | if (stat(cfg.homedir, &s) == 0 && !nowhitelist_flag && !arg_private) { |
378 | home_dir = 1; | 378 | home_dir = 1; |
379 | if (!arg_quiet) { | 379 | if (!arg_quiet) { |
380 | fprintf(stderr, "***\n"); | 380 | fprintf(stderr, "***\n"); |