diff options
-rw-r--r-- | Makefile | 3 | ||||
-rw-r--r-- | src/etc-cleanup/main.c (renamed from src/tools/cleanup_etc.c) | 12 | ||||
-rw-r--r-- | src/include/etc_groups.h | 1 |
3 files changed, 6 insertions, 10 deletions
@@ -12,7 +12,7 @@ endif | |||
12 | 12 | ||
13 | COMPLETIONDIRS = src/zsh_completion src/bash_completion | 13 | COMPLETIONDIRS = src/zsh_completion src/bash_completion |
14 | 14 | ||
15 | APPS = src/firecfg/firecfg src/firejail/firejail src/firemon/firemon src/profstats/profstats src/jailcheck/jailcheck | 15 | APPS = src/firecfg/firecfg src/firejail/firejail src/firemon/firemon src/profstats/profstats src/jailcheck/jailcheck src/etc-cleanup/etc-cleanup |
16 | SBOX_APPS = src/fbuilder/fbuilder src/ftee/ftee src/fids/fids | 16 | SBOX_APPS = src/fbuilder/fbuilder src/ftee/ftee src/fids/fids |
17 | SBOX_APPS_NON_DUMPABLE = src/fcopy/fcopy src/fldd/fldd src/fnet/fnet src/fnetfilter/fnetfilter src/fzenity/fzenity | 17 | SBOX_APPS_NON_DUMPABLE = src/fcopy/fcopy src/fldd/fldd src/fnet/fnet src/fnetfilter/fnetfilter src/fzenity/fzenity |
18 | SBOX_APPS_NON_DUMPABLE += src/fsec-optimize/fsec-optimize src/fsec-print/fsec-print src/fseccomp/fseccomp | 18 | SBOX_APPS_NON_DUMPABLE += src/fsec-optimize/fsec-optimize src/fsec-print/fsec-print src/fseccomp/fseccomp |
@@ -200,6 +200,7 @@ endif | |||
200 | install -m 0644 -t $(DESTDIR)$(libdir)/firejail $(MYLIBS) $(SECCOMP_FILTERS) | 200 | install -m 0644 -t $(DESTDIR)$(libdir)/firejail $(MYLIBS) $(SECCOMP_FILTERS) |
201 | install -m 0755 -t $(DESTDIR)$(libdir)/firejail $(SBOX_APPS) | 201 | install -m 0755 -t $(DESTDIR)$(libdir)/firejail $(SBOX_APPS) |
202 | install -m 0755 -t $(DESTDIR)$(libdir)/firejail src/profstats/profstats | 202 | install -m 0755 -t $(DESTDIR)$(libdir)/firejail src/profstats/profstats |
203 | install -m 0755 -t $(DESTDIR)$(libdir)/firejail src/etc-cleanup/etc-cleanup | ||
203 | # plugins w/o read permission (non-dumpable) | 204 | # plugins w/o read permission (non-dumpable) |
204 | install -m 0711 -t $(DESTDIR)$(libdir)/firejail $(SBOX_APPS_NON_DUMPABLE) | 205 | install -m 0711 -t $(DESTDIR)$(libdir)/firejail $(SBOX_APPS_NON_DUMPABLE) |
205 | install -m 0711 -t $(DESTDIR)$(libdir)/firejail src/fshaper/fshaper.sh | 206 | install -m 0711 -t $(DESTDIR)$(libdir)/firejail src/fshaper/fshaper.sh |
diff --git a/src/tools/cleanup_etc.c b/src/etc-cleanup/main.c index f57a1ddb1..47fe1556b 100644 --- a/src/tools/cleanup_etc.c +++ b/src/etc-cleanup/main.c | |||
@@ -18,15 +18,9 @@ | |||
18 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | 18 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | #include <stdio.h> | ||
22 | #include <stdlib.h> | ||
23 | #include <string.h> | ||
24 | #include <stdarg.h> | ||
25 | #include <assert.h> | ||
26 | #include "../include/etc_groups.h" | 21 | #include "../include/etc_groups.h" |
27 | #define errExit(msg) do { char msgout[500]; sprintf(msgout, "Error %s:%s(%d)", msg, __FUNCTION__, __LINE__); perror(msgout); exit(1);} while (0) | 22 | #include "../include/common.h" |
28 | 23 | #include <stdarg.h> | |
29 | |||
30 | 24 | ||
31 | #define MAX_BUF 4098 | 25 | #define MAX_BUF 4098 |
32 | #define MAX_ARR 1024 | 26 | #define MAX_ARR 1024 |
@@ -223,7 +217,7 @@ static void usage(void) { | |||
223 | printf("Group and clean private-etc entries in one or more profile files.\n"); | 217 | printf("Group and clean private-etc entries in one or more profile files.\n"); |
224 | printf("Options:\n"); | 218 | printf("Options:\n"); |
225 | printf(" --debug - print debug messages\n"); | 219 | printf(" --debug - print debug messages\n"); |
226 | printf(" --help - this help screen\n"); | 220 | printf(" -h, -?, --help - this help screen\n"); |
227 | printf(" --replace - replace profile file\n"); | 221 | printf(" --replace - replace profile file\n"); |
228 | } | 222 | } |
229 | 223 | ||
diff --git a/src/include/etc_groups.h b/src/include/etc_groups.h index 61ac8ac69..dd9d94ffd 100644 --- a/src/include/etc_groups.h +++ b/src/include/etc_groups.h | |||
@@ -20,6 +20,7 @@ | |||
20 | 20 | ||
21 | #ifndef ETC_GROUPS_H | 21 | #ifndef ETC_GROUPS_H |
22 | #define ETC_GROUPS_H | 22 | #define ETC_GROUPS_H |
23 | #include <stddef.h> | ||
23 | 24 | ||
24 | #define ETC_MAX 256 | 25 | #define ETC_MAX 256 |
25 | 26 | ||