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 ed3c4f4c063268079438cb1917ddc98b6214ba81..ab31db77bee7672b11c68690b852e9c0f8415fb1 100644 (file)
--- 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);