diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-09 15:07:22 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-09 15:07:22 +0200 |
| commit | fd4a54698cee48da073622f7d6ac49c94ccb1808 (patch) | |
| tree | b16110018cd3a21a19561f45376403e1e8815cfb /tools/omfwd.c | |
| parent | 88ff647aef4c6db3c444c6d080f9886350ca9584 (diff) | |
| parent | 87a01476e2a63ab7b6740b6b4182281d271ef382 (diff) | |
| download | rsyslog-fd4a54698cee48da073622f7d6ac49c94ccb1808.tar.gz rsyslog-fd4a54698cee48da073622f7d6ac49c94ccb1808.tar.xz rsyslog-fd4a54698cee48da073622f7d6ac49c94ccb1808.zip | |
Merge branch 'v5-stable' into beta
Conflicts:
tools/omfwd.c
Diffstat (limited to 'tools/omfwd.c')
| -rw-r--r-- | tools/omfwd.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/omfwd.c b/tools/omfwd.c index be13bf75..c39d1d67 100644 --- a/tools/omfwd.c +++ b/tools/omfwd.c @@ -102,12 +102,11 @@ typedef struct _instanceData { } instanceData; /* config data */ - typedef struct configSettings_s { uchar *pszTplName; /* name of the default template to use */ uchar *pszStrmDrvr; /* name of the stream driver to use */ - short iStrmDrvrMode; /* mode for stream driver, driver-dependent (0 mostly means plain tcp) */ - short bResendLastOnRecon; /* should the last message be re-sent on a successful reconnect? */ + int iStrmDrvrMode; /* mode for stream driver, driver-dependent (0 mostly means plain tcp) */ + int bResendLastOnRecon; /* should the last message be re-sent on a successful reconnect? */ uchar *pszStrmDrvrAuthMode; /* authentication mode to use */ int iUDPRebindInterval; /* support for automatic re-binding (load balancers!). 0 - no rebind */ int iTCPRebindInterval; /* support for automatic re-binding (load balancers!). 0 - no rebind */ |