aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2018-04-23 09:08:40 -0400
committerLibravatar netblue30 <netblue30@yahoo.com>2018-04-23 09:08:40 -0400
commita7c262bc14b7fbe55d78ab6af462898da97ab619 (patch)
treecd8f41a82c484cd4b78471cd418744586ee8c5fc /src
parentMerge pull request #1906 from aerusso/pulls/join-or-start (diff)
downloadfirejail-a7c262bc14b7fbe55d78ab6af462898da97ab619.tar.gz
firejail-a7c262bc14b7fbe55d78ab6af462898da97ab619.tar.zst
firejail-a7c262bc14b7fbe55d78ab6af462898da97ab619.zip
merges
Diffstat (limited to 'src')
-rw-r--r--src/firejail/env.c2
-rw-r--r--src/firejail/sandbox.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/firejail/env.c b/src/firejail/env.c
index cc63bd542..a09be8a77 100644
--- a/src/firejail/env.c
+++ b/src/firejail/env.c
@@ -52,6 +52,8 @@ static void env_add(Env *env) {
52 52
53// load IBUS env variables 53// load IBUS env variables
54void env_ibus_load(void) { 54void env_ibus_load(void) {
55 EUID_ASSERT();
56
55 // check ~/.config/ibus/bus directory 57 // check ~/.config/ibus/bus directory
56 char *dirname; 58 char *dirname;
57 if (asprintf(&dirname, "%s/.config/ibus/bus", cfg.homedir) == -1) 59 if (asprintf(&dirname, "%s/.config/ibus/bus", cfg.homedir) == -1)
diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c
index e1959a453..8abdf6b2c 100644
--- a/src/firejail/sandbox.c
+++ b/src/firejail/sandbox.c
@@ -668,10 +668,11 @@ int sandbox(void* sandbox_arg) {
668 if (arg_nonetwork || any_bridge_configured() || any_interface_configured()) { 668 if (arg_nonetwork || any_bridge_configured() || any_interface_configured()) {
669 // do nothing - there are problems with ibus version 1.5.11 669 // do nothing - there are problems with ibus version 1.5.11
670 } 670 }
671 else 671 else {
672 EUID_USER(); 672 EUID_USER();
673 env_ibus_load(); 673 env_ibus_load();
674 EUID_ROOT(); 674 EUID_ROOT();
675 }
675 676
676 //**************************** 677 //****************************
677 // fs pre-processing: 678 // fs pre-processing: