Possible fix for GeoIP2 bug

beave · Jun 26, 2015 · 2dc6b76 · 2dc6b76
1 parent 131ede5
commit 2dc6b76
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/processors/sagan-engine.c b/src/processors/sagan-engine.c
@@ -652,8 +652,6 @@ int Sagan_Engine ( _SaganProcSyslog *SaganProcSyslog_LOCAL )
 
 #ifdef HAVE_LIBMAXMINDDB
 
-                            geoip2_isset = 0;           /* Reset,  so we dont use previous value */
-
                             if ( rulestruct[b].geoip2_flag )
                                 {
 
@@ -1314,6 +1312,9 @@ int Sagan_Engine ( _SaganProcSyslog *SaganProcSyslog_LOCAL )
 
                 } /* End of pcre match */
 
+#ifdef WITH_BLUEDOT
+	   geoip2_isset = 0;
+#endif
             match=0;  		/* Reset match! */
             sagan_match=0;	/* Reset pcre/meta_content/content match! */
             rc=0;		/* Return code */

diff --git a/src/sagan-liblognorm.h b/src/sagan-liblognorm.h
@@ -58,7 +58,7 @@ typedef struct _SaganNormalizeLiblognorm
 
     char username[MAX_USERNAME_SIZE];
     char filename[MAX_FILENAME_SIZE];
-    char filehash_md5[MAX_HASH_SIZE];			// CHAMP -> needs to be BLUEDOT_MAX_HASH_SIZE
+    char filehash_md5[MAX_HASH_SIZE];		
     char url[MAX_URL_SIZE];
 
 } _SaganNormalizeLiblognorm;