diff options
author | netblue30 <netblue30@protonmail.com> | 2022-01-20 12:36:55 -0500 |
---|---|---|
committer | netblue30 <netblue30@protonmail.com> | 2022-01-20 12:36:55 -0500 |
commit | c3d9e4baba0294355f7c71e422a995303c41ed2f (patch) | |
tree | d9c174c6a325955f27ea80be639226d43effbf36 | |
parent | profiles: enable deterministic shutdown for ssh (#4870) (diff) | |
download | firejail-c3d9e4baba0294355f7c71e422a995303c41ed2f.tar.gz firejail-c3d9e4baba0294355f7c71e422a995303c41ed2f.tar.zst firejail-c3d9e4baba0294355f7c71e422a995303c41ed2f.zip |
hostnames -> static-ip-map
-rw-r--r-- | Makefile.in | 2 | ||||
-rw-r--r-- | src/fnettrace/main.c | 5 | ||||
-rw-r--r-- | src/fnettrace/static-ip-map (renamed from src/fnettrace/hostnames) | 0 |
3 files changed, 2 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index ccd59170d..29bd53d21 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -123,6 +123,7 @@ endif | |||
123 | # plugins w/o read permission (non-dumpable) | 123 | # plugins w/o read permission (non-dumpable) |
124 | install -m 0711 -t $(DESTDIR)$(libdir)/firejail $(SBOX_APPS_NON_DUMPABLE) | 124 | install -m 0711 -t $(DESTDIR)$(libdir)/firejail $(SBOX_APPS_NON_DUMPABLE) |
125 | install -m 0711 -t $(DESTDIR)$(libdir)/firejail src/fshaper/fshaper.sh | 125 | install -m 0711 -t $(DESTDIR)$(libdir)/firejail src/fshaper/fshaper.sh |
126 | install -m 0644 -t $(DESTDIR)$(libdir)/firejail src/fnettrace/static-ip-map | ||
126 | ifeq ($(HAVE_CONTRIB_INSTALL),yes) | 127 | ifeq ($(HAVE_CONTRIB_INSTALL),yes) |
127 | # contrib scripts | 128 | # contrib scripts |
128 | install -m 0755 -t $(DESTDIR)$(libdir)/firejail contrib/*.py contrib/*.sh | 129 | install -m 0755 -t $(DESTDIR)$(libdir)/firejail contrib/*.py contrib/*.sh |
@@ -138,7 +139,6 @@ endif | |||
138 | # profiles and settings | 139 | # profiles and settings |
139 | install -m 0755 -d $(DESTDIR)$(sysconfdir)/firejail | 140 | install -m 0755 -d $(DESTDIR)$(sysconfdir)/firejail |
140 | install -m 0644 -t $(DESTDIR)$(sysconfdir)/firejail src/firecfg/firecfg.config | 141 | install -m 0644 -t $(DESTDIR)$(sysconfdir)/firejail src/firecfg/firecfg.config |
141 | install -m 0644 -t $(DESTDIR)$(sysconfdir)/firejail src/fnettrace/hostnames | ||
142 | install -m 0644 -t $(DESTDIR)$(sysconfdir)/firejail etc/profile-a-l/*.profile etc/profile-m-z/*.profile etc/inc/*.inc etc/net/*.net etc/firejail.config etc/ids.config | 142 | install -m 0644 -t $(DESTDIR)$(sysconfdir)/firejail etc/profile-a-l/*.profile etc/profile-m-z/*.profile etc/inc/*.inc etc/net/*.net etc/firejail.config etc/ids.config |
143 | sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;" | 143 | sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;" |
144 | ifeq ($(BUSYBOX_WORKAROUND),yes) | 144 | ifeq ($(BUSYBOX_WORKAROUND),yes) |
diff --git a/src/fnettrace/main.c b/src/fnettrace/main.c index dd5fb8c48..e58cc79b3 100644 --- a/src/fnettrace/main.c +++ b/src/fnettrace/main.c | |||
@@ -623,11 +623,8 @@ int main(int argc, char **argv) { | |||
623 | if (arg_netfilter) | 623 | if (arg_netfilter) |
624 | logprintf("starting network lockdown\n"); | 624 | logprintf("starting network lockdown\n"); |
625 | else { | 625 | else { |
626 | char *fname; | 626 | char *fname = LIBDIR "/firejail/static-ip-map"; |
627 | if (asprintf(&fname, "%s/hostnames", SYSCONFDIR) == -1) | ||
628 | errExit("asprintf"); | ||
629 | load_hostnames(fname); | 627 | load_hostnames(fname); |
630 | free(fname); | ||
631 | } | 628 | } |
632 | 629 | ||
633 | run_trace(); | 630 | run_trace(); |
diff --git a/src/fnettrace/hostnames b/src/fnettrace/static-ip-map index e24ecf218..e24ecf218 100644 --- a/src/fnettrace/hostnames +++ b/src/fnettrace/static-ip-map | |||