From: Russ Combs <rucombs@cisco.com>
Date: Tue, 16 Sep 2014 22:37:25 +0000 (-0400)
Subject: tweak
X-Git-Tag: 3.0.0-233~1411^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06fe18b23b60b82a310b07410508f8564f04186d;p=thirdparty%2Fsnort3.git

tweak
---

diff --git a/ChangeLog b/ChangeLog
index 9778cfe2c..34bb75f90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
 -- added unused stringify(enum)
 -- fixed piroir typo
 -- fixed normalizer.tcp.ips
+-- pulled in latest from Josh
 
 119
 -- updated binder
diff --git a/src/managers/ips_manager.cc b/src/managers/ips_manager.cc
index 8152a4210..b40714f35 100644
--- a/src/managers/ips_manager.cc
+++ b/src/managers/ips_manager.cc
@@ -202,7 +202,7 @@ bool IpsManager::option_begin(
         ParseError("can't initialize %s", key);
         return false;
     }
-    current_keyword = std::string(key);
+    current_keyword = key;
     current_params = current_module ? current_module->get_parameters() : nullptr;
     return true;
 }