diff options
author | smitsohu <smitsohu@gmail.com> | 2019-08-09 15:24:45 +0200 |
---|---|---|
committer | smitsohu <smitsohu@gmail.com> | 2019-08-09 15:24:45 +0200 |
commit | d32509945f13ccb9892ad15303230955bb525fae (patch) | |
tree | be817141d532145f569ac8a43d153158949304b1 /src/firejail/checkcfg.c | |
parent | Fix printer detection in okular and gwenview (diff) | |
download | firejail-d32509945f13ccb9892ad15303230955bb525fae.tar.gz firejail-d32509945f13ccb9892ad15303230955bb525fae.tar.zst firejail-d32509945f13ccb9892ad15303230955bb525fae.zip |
rewrite/partial revert of 8bff773d6a7bf70c97b3d5b751df9ec0dd6c8b5d
the commit in question introduced an early check of Firejail configuration
file, which broke "firejail in firejail" for some sandboxes.
see issue #2877
Diffstat (limited to 'src/firejail/checkcfg.c')
-rw-r--r-- | src/firejail/checkcfg.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/firejail/checkcfg.c b/src/firejail/checkcfg.c index 84054fe76..f94b95d60 100644 --- a/src/firejail/checkcfg.c +++ b/src/firejail/checkcfg.c | |||
@@ -50,7 +50,6 @@ int checkcfg(int val) { | |||
50 | cfg_val[CFG_DISABLE_MNT] = 0; | 50 | cfg_val[CFG_DISABLE_MNT] = 0; |
51 | cfg_val[CFG_ARP_PROBES] = DEFAULT_ARP_PROBES; | 51 | cfg_val[CFG_ARP_PROBES] = DEFAULT_ARP_PROBES; |
52 | cfg_val[CFG_XPRA_ATTACH] = 0; | 52 | cfg_val[CFG_XPRA_ATTACH] = 0; |
53 | cfg_val[CFG_HOMEDIR_SYMLINK] = 0; | ||
54 | 53 | ||
55 | // open configuration file | 54 | // open configuration file |
56 | const char *fname = SYSCONFDIR "/firejail.config"; | 55 | const char *fname = SYSCONFDIR "/firejail.config"; |
@@ -86,7 +85,6 @@ int checkcfg(int val) { | |||
86 | ptr = line_remove_spaces(buf); | 85 | ptr = line_remove_spaces(buf); |
87 | if (!ptr) | 86 | if (!ptr) |
88 | continue; | 87 | continue; |
89 | PARSE_YESNO(CFG_HOMEDIR_SYMLINK, "homedir-symlink") | ||
90 | PARSE_YESNO(CFG_FILE_TRANSFER, "file-transfer") | 88 | PARSE_YESNO(CFG_FILE_TRANSFER, "file-transfer") |
91 | PARSE_YESNO(CFG_DBUS, "dbus") | 89 | PARSE_YESNO(CFG_DBUS, "dbus") |
92 | PARSE_YESNO(CFG_JOIN, "join") | 90 | PARSE_YESNO(CFG_JOIN, "join") |