diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-09 15:02:02 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-09 15:02:02 +0200 |
| commit | b1fe03c82f0c3fbb9ec7209922fbdc2deeec0bdd (patch) | |
| tree | 73ca6650dcd8639a16d5c534bdead1f6cb19b539 | |
| parent | 6625a8790d3e89b3ecc0612cf08fc917b9631398 (diff) | |
| parent | 1d41b9540ccf8b6714135737855ab71ee75f4364 (diff) | |
| download | rsyslog-b1fe03c82f0c3fbb9ec7209922fbdc2deeec0bdd.tar.gz rsyslog-b1fe03c82f0c3fbb9ec7209922fbdc2deeec0bdd.tar.xz rsyslog-b1fe03c82f0c3fbb9ec7209922fbdc2deeec0bdd.zip | |
Merge branch 'v4-devel' into v5-devel
Conflicts:
ChangeLog
runtime/parser.c
tests/Makefile.am
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | tools/omfwd.c | 4 |
2 files changed, 8 insertions, 2 deletions
@@ -273,6 +273,8 @@ Version 5.6.2 [V5-STABLE] (rgerhards), 2010-11-30 - added the $InputFilePersistStateInterval config directive to imfile - changed imfile so that the state file is never deleted (makes imfile more robust in regard to fatal failures) +- bugfix: a slightly more informative error message when a TCP + connections is aborted --------------------------------------------------------------------------- Version 5.6.1 [V5-STABLE] (rgerhards), 2010-11-24 - bugfix(important): problem in TLS handling could cause rsyslog to loop @@ -837,6 +839,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 */ |