diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-09 14:39:54 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-09 14:39:54 +0200 |
commit | 87a01476e2a63ab7b6740b6b4182281d271ef382 (patch) | |
tree | 152b6616c19347f235e0d8413ab0f59e31f52cc4 | |
parent | 5bf922d65a003fa3404290028aaf5b15e7c8420a (diff) | |
parent | 831ce25230f6c8cd7c362fda3616e1233a61cf00 (diff) | |
download | rsyslog-87a01476e2a63ab7b6740b6b4182281d271ef382.tar.gz rsyslog-87a01476e2a63ab7b6740b6b4182281d271ef382.tar.xz rsyslog-87a01476e2a63ab7b6740b6b4182281d271ef382.zip |
Merge branch 'v4-stable' into v5-stable
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | tools/omfwd.c | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -811,6 +811,10 @@ Version 4.7.0 [v4-devel] (rgerhards), 2010-04-14 - imported changes from 4.5.6 and below --------------------------------------------------------------------------- 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 - 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 38a4a16b..10cce0e2 100644 --- a/tools/omfwd.c +++ b/tools/omfwd.c @@ -102,8 +102,8 @@ 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 short bResendLastOnRecon = 0; /* should the last message be re-sent on a successful reconnect? */ +static int iStrmDrvrMode = 0; /* mode for stream driver, driver-dependent (0 mostly means plain tcp) */ +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 */ |