Merge pull request #708 in SNORT/snort3 from obfucator_warning_fix to master

Squashed commit of the following:

commit 85dc8a679a7e181b24bad1cd4207d59b4772db29
Author: Bhagya Tholpady <bbantwal@cisco.com>
Date:   Thu Nov 17 14:00:57 2016 -0500

    obfuscator warning fix

diff --git a/src/log/obfuscator.h b/src/log/obfuscator.h
index aa2be6e835c7431200ec7472adbfcf72b8c09304..47e177a212e641ab54fae3e962422a3e6a3fdbc2 100644 (file)
--- a/src/log/obfuscator.h
+++ b/src/log/obfuscator.h
@@ -65,7 +65,7 @@ public:
     bool first(ObfuscatorBlock &b);
     bool next(ObfuscatorBlock &b);
 
-    const char get_mask_char()
+    char get_mask_char()
     { return mask_char; }
 
 private: