summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-05-09 12:29:07 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-05-09 12:29:07 +0200
commit831ce25230f6c8cd7c362fda3616e1233a61cf00 (patch)
treeb8bf89cc0f0c9e1d2ee8514d7e1f6fec1b6d08f8
parent816ab51f4b81bccc4b8408dfec311d9168269818 (diff)
downloadrsyslog-831ce25230f6c8cd7c362fda3616e1233a61cf00.tar.gz
rsyslog-831ce25230f6c8cd7c362fda3616e1233a61cf00.tar.xz
rsyslog-831ce25230f6c8cd7c362fda3616e1233a61cf00.zip
bugfix: invalid storage type for config variables
-rw-r--r--ChangeLog1
-rw-r--r--tools/omfwd.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b06f480c..8e586002 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
---------------------------------------------------------------------------
Version 4.6.6 [v4-stable] (rgerhards), 2010-11-??
+- bugfix: invalid storage type for config variables
- bugfix: stream driver mode was not correctly set on tcp ouput on big
endian systems.
thanks varmojfekoj for the patch
diff --git a/tools/omfwd.c b/tools/omfwd.c
index 16d438f6..aadeec6a 100644
--- a/tools/omfwd.c
+++ b/tools/omfwd.c
@@ -102,7 +102,7 @@ typedef struct _instanceData {
static uchar *pszTplName = NULL; /* name of the default template to use */
static uchar *pszStrmDrvr = NULL; /* name of the stream driver to use */
static int iStrmDrvrMode = 0; /* mode for stream driver, driver-dependent (0 mostly means plain tcp) */
-static short bResendLastOnRecon = 0; /* should the last message be re-sent on a successful reconnect? */
+static int bResendLastOnRecon = 0; /* should the last message be re-sent on a successful reconnect? */
static uchar *pszStrmDrvrAuthMode = NULL; /* authentication mode to use */
static int iUDPRebindInterval = 0; /* support for automatic re-binding (load balancers!). 0 - no rebind */
static int iTCPRebindInterval = 0; /* support for automatic re-binding (load balancers!). 0 - no rebind */