From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Wed, 23 Nov 2016 22:45:02 +0000 (-0500)
Subject: Merge pull request #721 in SNORT/snort3 from double_lua to master
X-Git-Tag: 3.0.0-233~172
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91a996fd87bad74eae02ef6e0e5f2cc9b3df7a9f;p=thirdparty%2Fsnort3.git

Merge pull request #721 in SNORT/snort3 from double_lua to master

Squashed commit of the following:

commit b5229dc110c61a58eb586c2a6ef681001dcfacc1
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Mon Nov 21 15:05:39 2016 -0500

    added multiple passes to lua so variables are always set before used
---

diff --git a/src/managers/snort_config.lua b/src/managers/snort_config.lua
index 8821730da..28c87a812 100644
--- a/src/managers/snort_config.lua
+++ b/src/managers/snort_config.lua
@@ -42,7 +42,18 @@ function snort_traverse(tab, fqn)
     for key,val in pairs(tab) do
         -- skip Lua reserved symbols
         if ( string.sub(key, 1, 1) ~= '_' ) then
-            snort_set(fqn, key, val)
+            if ( type(val) == 'string' ) then
+                snort_set(fqn, key, val)
+            end
+        end
+    end
+
+    for key,val in pairs(tab) do
+        -- skip Lua reserved symbols
+        if ( string.sub(key, 1, 1) ~= '_' ) then
+            if ( type(val) ~= 'string' ) then
+                snort_set(fqn, key, val)
+            end
         end
     end
 end