aboutsummaryrefslogtreecommitdiffstats
path: root/src/firemon/firemon.c
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2016-02-24 12:55:06 -0500
committerLibravatar netblue30 <netblue30@yahoo.com>2016-02-24 12:55:06 -0500
commit89535f782c19fd8396fd013d4b38d746f3faed95 (patch)
tree255335eea7b669906fe2989a880b0f2ac595999b /src/firemon/firemon.c
parentallow --interface only to root user for --enable-network=restricted (diff)
downloadfirejail-89535f782c19fd8396fd013d4b38d746f3faed95.tar.gz
firejail-89535f782c19fd8396fd013d4b38d746f3faed95.tar.zst
firejail-89535f782c19fd8396fd013d4b38d746f3faed95.zip
x11 work
Diffstat (limited to 'src/firemon/firemon.c')
-rw-r--r--src/firemon/firemon.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/firemon/firemon.c b/src/firemon/firemon.c
index 679c5a3e9..c19c344b0 100644
--- a/src/firemon/firemon.c
+++ b/src/firemon/firemon.c
@@ -33,6 +33,7 @@ static int arg_seccomp = 0;
33static int arg_caps = 0; 33static int arg_caps = 0;
34static int arg_cpu = 0; 34static int arg_cpu = 0;
35static int arg_cgroup = 0; 35static int arg_cgroup = 0;
36static int arg_x11 = 0;
36int arg_nowrap = 0; 37int arg_nowrap = 0;
37 38
38static struct termios tlocal; // startup terminal setting 39static struct termios tlocal; // startup terminal setting
@@ -141,6 +142,9 @@ int main(int argc, char **argv) {
141 142
142 143
143 // cumulative options with or without a pid argument 144 // cumulative options with or without a pid argument
145 else if (strcmp(argv[i], "--x11") == 0) {
146 arg_x11 = 1;
147 }
144 else if (strcmp(argv[i], "--cgroup") == 0) { 148 else if (strcmp(argv[i], "--cgroup") == 0) {
145 arg_cgroup = 1; 149 arg_cgroup = 1;
146 } 150 }
@@ -217,6 +221,8 @@ int main(int argc, char **argv) {
217 cpu((pid_t) pid); 221 cpu((pid_t) pid);
218 if (arg_cgroup) 222 if (arg_cgroup)
219 cgroup((pid_t) pid); 223 cgroup((pid_t) pid);
224 if (arg_x11)
225 x11((pid_t) pid);
220 226
221 if (!arg_route && !arg_arp && !arg_interface && !arg_tree && !arg_caps && !arg_seccomp) 227 if (!arg_route && !arg_arp && !arg_interface && !arg_tree && !arg_caps && !arg_seccomp)
222 procevent((pid_t) pid); // never to return 228 procevent((pid_t) pid); // never to return