summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Heinrich <theinric@redhat.com>2011-05-09 12:24:14 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-05-09 12:24:14 +0200
commit816ab51f4b81bccc4b8408dfec311d9168269818 (patch)
tree0b0149b611188f19a0b07656a13ed15261819c9d
parent678a904620222b9113db8b5f89e988a064b05cd9 (diff)
downloadrsyslog-816ab51f4b81bccc4b8408dfec311d9168269818.tar.gz
rsyslog-816ab51f4b81bccc4b8408dfec311d9168269818.tar.xz
rsyslog-816ab51f4b81bccc4b8408dfec311d9168269818.zip
bugfix: stream driver mode was not correctly set on tcp ouput on big endian systems.
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
-rw-r--r--ChangeLog3
-rw-r--r--tools/omfwd.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2bd52a85..b06f480c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
---------------------------------------------------------------------------
Version 4.6.6 [v4-stable] (rgerhards), 2010-11-??
+- bugfix: stream driver mode was not correctly set on tcp ouput on big
+ endian systems.
+ thanks varmojfekoj for the patch
- bugfix: IPv6-address could not be specified in omrelp
this was due to improper parsing of ":"
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=250
diff --git a/tools/omfwd.c b/tools/omfwd.c
index 96b365a0..16d438f6 100644
--- a/tools/omfwd.c
+++ b/tools/omfwd.c
@@ -101,7 +101,7 @@ typedef struct _instanceData {
/* config data */
static uchar *pszTplName = NULL; /* name of the default template to use */
static uchar *pszStrmDrvr = NULL; /* name of the stream driver to use */
-static short iStrmDrvrMode = 0; /* mode for stream driver, driver-dependent (0 mostly means plain tcp) */
+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 uchar *pszStrmDrvrAuthMode = NULL; /* authentication mode to use */
static int iUDPRebindInterval = 0; /* support for automatic re-binding (load balancers!). 0 - no rebind */