Skip to content

Commit e6f2374

Browse files
committed
installing etc-cleanup tool in /usr/lib/firejail directory
1 parent 82c244f commit e6f2374

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ endif
1212

1313
COMPLETIONDIRS = src/zsh_completion src/bash_completion
1414

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
1616
SBOX_APPS = src/fbuilder/fbuilder src/ftee/ftee src/fids/fids
1717
SBOX_APPS_NON_DUMPABLE = src/fcopy/fcopy src/fldd/fldd src/fnet/fnet src/fnetfilter/fnetfilter src/fzenity/fzenity
1818
SBOX_APPS_NON_DUMPABLE += src/fsec-optimize/fsec-optimize src/fsec-print/fsec-print src/fseccomp/fseccomp
@@ -200,6 +200,7 @@ endif
200200
install -m 0644 -t $(DESTDIR)$(libdir)/firejail $(MYLIBS) $(SECCOMP_FILTERS)
201201
install -m 0755 -t $(DESTDIR)$(libdir)/firejail $(SBOX_APPS)
202202
install -m 0755 -t $(DESTDIR)$(libdir)/firejail src/profstats/profstats
203+
install -m 0755 -t $(DESTDIR)$(libdir)/firejail src/etc-cleanup/etc-cleanup
203204
# plugins w/o read permission (non-dumpable)
204205
install -m 0711 -t $(DESTDIR)$(libdir)/firejail $(SBOX_APPS_NON_DUMPABLE)
205206
install -m 0711 -t $(DESTDIR)$(libdir)/firejail src/fshaper/fshaper.sh

src/tools/cleanup_etc.c renamed to src/etc-cleanup/main.c

+3-9
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,9 @@
1818
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1919
*/
2020

21-
#include <stdio.h>
22-
#include <stdlib.h>
23-
#include <string.h>
24-
#include <stdarg.h>
25-
#include <assert.h>
2621
#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)
28-
29-
22+
#include "../include/common.h"
23+
#include <stdarg.h>
3024

3125
#define MAX_BUF 4098
3226
#define MAX_ARR 1024
@@ -223,7 +217,7 @@ static void usage(void) {
223217
printf("Group and clean private-etc entries in one or more profile files.\n");
224218
printf("Options:\n");
225219
printf(" --debug - print debug messages\n");
226-
printf(" --help - this help screen\n");
220+
printf(" -h, -?, --help - this help screen\n");
227221
printf(" --replace - replace profile file\n");
228222
}
229223

src/include/etc_groups.h

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
#ifndef ETC_GROUPS_H
2222
#define ETC_GROUPS_H
23+
#include <stddef.h>
2324

2425
#define ETC_MAX 256
2526

0 commit comments

Comments
 (0)