From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Mon, 29 Feb 2016 20:27:04 +0000 (-0500)
Subject: Merge pull request #305 in SNORT/snort3 from crc/reload to master
X-Git-Tag: 3.0.0-233~569
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a117fb9faaec22e9eb8cb80fd0ba27209b33f2b;p=thirdparty%2Fsnort3.git

Merge pull request #305 in SNORT/snort3 from crc/reload to master

Squashed commit of the following:

commit 361540f80cafb2f8a80ea169aa35d2200bda7a10
Author: snorty <snorty@localhost.localdomain>
Date:   Mon Feb 29 15:15:23 2016 -0500

    fix conf reload by signal to use -c filename
---

diff --git a/src/main.cc b/src/main.cc
index a89377fff..6ab2fce5a 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -305,8 +305,13 @@ int main_reload_config(lua_State* L)
         request.respond("== reload pending; retry\n");
         return 0;
     }
-    Lua::ManageStack(L, 1);
-    const char* fname = luaL_checkstring(L, 1);
+    const char* fname =  nullptr;
+
+    if ( L )
+    {
+        Lua::ManageStack(L, 1);
+        fname = luaL_checkstring(L, 1);
+    }
 
     request.respond(".. reloading configuration\n");
     SnortConfig* old = snort_conf;