1 files changed, 25 insertions, 1 deletions

diff --git a/src/firejail/dhcp.c b/src/firejail/dhcp.c
index 37547a985..456bba91b 100644
--- a/src/firejail/dhcp.c
+++ b/src/firejail/dhcp.c
@@ -130,7 +130,9 @@ static void dhcp_waitll_all() {
                 dhcp_waitll(cfg.bridge3.devsandbox);
 }
 
-void dhcp_start(void) {
+// Temporarily copy dhclient executable under /run/firejail/mnt and start it from there
+// in order to recognize it later in firemon and firetools
+void dhcp_store_exec(void) {
         if (!any_dhcp())
                 return;
 
@@ -144,6 +146,26 @@ void dhcp_start(void) {
                 }
         }
 
+        sbox_run(SBOX_ROOT| SBOX_SECCOMP, 4, PATH_FCOPY, "--follow-link", dhclient_path, RUN_MNT_DIR);
+}
+
+void dhcp_start(void) {
+        if (!any_dhcp())
+                return;
+
+        char *dhclient_path = RUN_MNT_DIR "/dhclient";;
+        struct stat s;
+        if (stat(dhclient_path, &s) == -1) {
+                dhclient_path = "/usr/sbin/dhclient";
+                if (stat(dhclient_path, &s) == -1) {
+                        fprintf(stderr, "Error: dhclient was not found.\n");
+                        exit(1);
+                }
+        }
+
+        sbox_run(SBOX_ROOT| SBOX_SECCOMP, 4, PATH_FCOPY, "--follow-link", dhclient_path, RUN_MNT_DIR);
+        dhclient_path = RUN_MNT_DIR "/dhclient";
+
         EUID_ROOT();
         if (mkdir(RUN_DHCLIENT_DIR, 0700))
                 errExit("mkdir");
@@ -163,4 +185,6 @@ void dhcp_start(void) {
                         exit(1);
                 }
         }
+
+        unlink(dhclient_path);
 }