From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Fri, 8 Jul 2022 17:25:43 +0000 (+0000)
Subject: Pull request #3505: sandbox: must propagate file_id for includer logic
X-Git-Tag: 3.1.35.0~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=046c53263087071302eae3c6e62a512cee7939fa;p=thirdparty%2Fsnort3.git

Pull request #3505: sandbox: must propagate file_id for includer logic

Merge in SNORT/snort3 from ~RUCOMBS/snort3:quick_sand to master

Squashed commit of the following:

commit 94541d79e83322cf81f0bdf87b6ad7803947f024
Author: russ <rucombs@cisco.com>
Date:   Fri Jul 8 12:17:56 2022 -0400

    sandbox: must propagate file_id for includer logic
---

diff --git a/src/main/bootstrap.lua b/src/main/bootstrap.lua
index cc473fb5d..c3b498405 100644
--- a/src/main/bootstrap.lua
+++ b/src/main/bootstrap.lua
@@ -113,6 +113,10 @@ function include(file)
         if ( sandbox_env.ips ) then
             ips = sandbox_env.ips
         end
+
+        if ( sandbox_env.file_id ) then
+            file_id = sandbox_env.file_id
+        end
     else
         dofile(fname)
     end