hostnames -> static-ip-map

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
         # plugins w/o read permission (non-dumpable)
         install -m 0711 -t $(DESTDIR)$(libdir)/firejail $(SBOX_APPS_NON_DUMPABLE)
         install -m 0711 -t $(DESTDIR)$(libdir)/firejail src/fshaper/fshaper.sh
+        install -m 0644 -t $(DESTDIR)$(libdir)/firejail src/fnettrace/static-ip-map
 ifeq ($(HAVE_CONTRIB_INSTALL),yes)
         # contrib scripts
         install -m 0755 -t $(DESTDIR)$(libdir)/firejail contrib/*.py contrib/*.sh
@@ -138,7 +139,6 @@ endif
         # profiles and settings
         install -m 0755 -d $(DESTDIR)$(sysconfdir)/firejail
         install -m 0644 -t $(DESTDIR)$(sysconfdir)/firejail src/firecfg/firecfg.config
-        install -m 0644 -t $(DESTDIR)$(sysconfdir)/firejail src/fnettrace/hostnames
         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
         sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;"
 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) {
         if (arg_netfilter)
                 logprintf("starting network lockdown\n");
         else  {
-                char *fname;
-                if (asprintf(&fname, "%s/hostnames", SYSCONFDIR) == -1)
-                        errExit("asprintf");
+                char *fname = LIBDIR "/firejail/static-ip-map";
                 load_hostnames(fname);
-                free(fname);
         }
 
         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