bugfix(minor): BSD_SO_COMPAT query function had some global vars not properly initialized.

However, in practice the loader initializes them with zero, the
desired value, so there were no actual issue in almost all cases.

4 files changed, 10 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 85a9ecb6..dc12e856 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,6 +39,10 @@ Version 4.6.2  [v4-stable] (rgerhards), 2010-03-??
   Previously, it could lead to garbagge output and, in extreme cases, also
   to segfaults. Note: this was a problem only when debug output was 
   actually enabled, so it caused no problem in production use.
+- bugfix(minor): BSD_SO_COMPAT query function had some global vars not
+  properly initialized. However, in practice the loader initializes them 
+  with zero, the desired value, so there were no actual issue in almost 
+  all cases.
 ---------------------------------------------------------------------------
 Version 4.6.1  [v4-stable] (rgerhards), 2010-03-04
 - re-enabled old pipe output (using new module ompipe, built-in) after
diff --git a/runtime/net.c b/runtime/net.c
index e91c8a7f..fe6eef5b 100644
--- a/runtime/net.c
+++ b/runtime/net.c
@@ -1010,8 +1010,8 @@ static int
 should_use_so_bsdcompat(void)
 {
 #ifndef OS_BSD
-    static int init_done;
-    static int so_bsdcompat_is_obsolete;
+    static int init_done = 0;
+    static int so_bsdcompat_is_obsolete = 0;
 
     if (!init_done) {
 	struct utsname myutsname;
diff --git a/tests/diag.sh b/tests/diag.sh
index a4f13afd..a4100ac0 100755
--- a/tests/diag.sh
+++ b/tests/diag.sh
@@ -7,7 +7,8 @@
 # This file is part of the rsyslog project, released under GPLv3
 #valgrind="valgrind --log-fd=1"
 #valgrind="valgrind --tool=drd --log-fd=1"
-#valgrind="valgrind --tool=helgrind --log-fd=1"
+valgrind="valgrind --tool=helgrind --log-fd=1"
+#valgrind="valgrind --tool=exp-ptrcheck --log-fd=1"
 #set -o xtrace
 #export RSYSLOG_DEBUG="debug nostdout printmutexaction"
 #export RSYSLOG_DEBUGLOG="log"
diff --git a/tests/dynfile_invalid.sh b/tests/dynfile_invalid.sh
index f61dc104..6c792db1 100755
--- a/tests/dynfile_invalid.sh
+++ b/tests/dynfile_invalid.sh
@@ -9,8 +9,8 @@ echo ===========================================================================
 echo TEST: \[dynfile_invalid.sh\]: test open fail for dynafiles
 source $srcdir/diag.sh init
 # uncomment for debugging support:
-export RSYSLOG_DEBUG="debug nostdout noprintmutexaction"
-export RSYSLOG_DEBUGLOG="log"
+#export RSYSLOG_DEBUG="debug nostdout noprintmutexaction"
+#export RSYSLOG_DEBUGLOG="log"
 source $srcdir/diag.sh startup dynfile_invalid.conf
 # we send handcrafted message. We have a dynafile cache of 4, and now send one message
 # each to fill up the cache.