diff options
author | netblue30 <netblue30@yahoo.com> | 2016-06-08 13:16:22 -0400 |
---|---|---|
committer | netblue30 <netblue30@yahoo.com> | 2016-06-08 13:16:22 -0400 |
commit | 6313ab799d95065ef75491a9d11d31a1d684701b (patch) | |
tree | 73e7cf6edd97a6b834a5f5847a3a9e2e8aeeccc5 | |
parent | lxc support (diff) | |
download | firejail-6313ab799d95065ef75491a9d11d31a1d684701b.tar.gz firejail-6313ab799d95065ef75491a9d11d31a1d684701b.tar.zst firejail-6313ab799d95065ef75491a9d11d31a1d684701b.zip |
fixes
-rw-r--r-- | src/firecfg/firecfg.config | 1 | ||||
-rw-r--r-- | src/firejail/appimage.c | 2 | ||||
-rw-r--r-- | src/firemon/procevent.c | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config index dfbfd5f3f..e31a7c12a 100644 --- a/src/firecfg/firecfg.config +++ b/src/firecfg/firecfg.config | |||
@@ -112,7 +112,6 @@ okular | |||
112 | xreader | 112 | xreader |
113 | 113 | ||
114 | # other | 114 | # other |
115 | openbox | ||
116 | snap | 115 | snap |
117 | ssh | 116 | ssh |
118 | 117 | ||
diff --git a/src/firejail/appimage.c b/src/firejail/appimage.c index 59ce31052..2d5a05b8d 100644 --- a/src/firejail/appimage.c +++ b/src/firejail/appimage.c | |||
@@ -103,6 +103,7 @@ void appimage_clear(void) { | |||
103 | if (rv == -1 && errno == EBUSY) { | 103 | if (rv == -1 && errno == EBUSY) { |
104 | sleep(1); | 104 | sleep(1); |
105 | rv = umount2(mntdir, MNT_FORCE); | 105 | rv = umount2(mntdir, MNT_FORCE); |
106 | (void) rv; | ||
106 | 107 | ||
107 | } | 108 | } |
108 | rmdir(mntdir); | 109 | rmdir(mntdir); |
@@ -112,6 +113,7 @@ void appimage_clear(void) { | |||
112 | if (devloop) { | 113 | if (devloop) { |
113 | int lfd = open(devloop, O_RDONLY); | 114 | int lfd = open(devloop, O_RDONLY); |
114 | rv = ioctl(lfd, LOOP_CLR_FD, 0); | 115 | rv = ioctl(lfd, LOOP_CLR_FD, 0); |
116 | (void) rv; | ||
115 | close(lfd); | 117 | close(lfd); |
116 | } | 118 | } |
117 | } | 119 | } |
diff --git a/src/firemon/procevent.c b/src/firemon/procevent.c index e2dd5aaa2..7c961adde 100644 --- a/src/firemon/procevent.c +++ b/src/firemon/procevent.c | |||
@@ -89,7 +89,8 @@ static int pid_is_firejail(pid_t pid) { | |||
89 | 89 | ||
90 | // list of firejail arguments that don't trigger sandbox creation | 90 | // list of firejail arguments that don't trigger sandbox creation |
91 | // the initial -- is not included | 91 | // the initial -- is not included |
92 | char *firejail_args = "ls list tree x11 help version top netstats debug-syscalls debug-errnos debug-protocols"; | 92 | char *firejail_args = "ls list tree x11 help version top netstats debug-syscalls debug-errnos debug-protocols " |
93 | "protocol.print debug.caps shutdown bandwidth caps.print cpu.print debug-caps fs.print get "; | ||
93 | 94 | ||
94 | int i; | 95 | int i; |
95 | char *start; | 96 | char *start; |