From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Tue, 4 Oct 2016 21:48:24 +0000 (-0400)
Subject: Merge pull request #654 in SNORT/snort3 from global_obfuscation_pii-fix to master
X-Git-Tag: 3.0.0-233~240
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=939e10a0e30fb2db9a9fe2aa4aebdd3226b51a6a;p=thirdparty%2Fsnort3.git

Merge pull request #654 in SNORT/snort3 from global_obfuscation_pii-fix to master

Squashed commit of the following:

commit 66c56b73c340a05cea0b32525357220c5159cbba
Author: Victor Roemer <viroemer@cisco.com>
Date:   Tue Oct 4 15:37:48 2016 -0400

    Fix explicit disable not working
---

diff --git a/src/main/modules.cc b/src/main/modules.cc
index ed3c4f4c0..ab31db77b 100644
--- a/src/main/modules.cc
+++ b/src/main/modules.cc
@@ -772,7 +772,7 @@ bool OutputModule::set(const char*, Value& v, SnortConfig* sc)
         v.update_mask(sc->output_flags, OUTPUT_FLAG__OBFUSCATE);
 
     else if ( v.is("obfuscate_pii") )
-        sc->obfuscate_pii = true;
+        sc->obfuscate_pii = v.get_bool();
 
     else if ( v.is("show_year") )
         v.update_mask(sc->output_flags, OUTPUT_FLAG__INCLUDE_YEAR);