diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-21 04:29:53 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-21 04:29:53 +0200 |
| commit | 780e2d37e4d27f040d15e09b25542d6808a19436 (patch) | |
| tree | ed63ad693d64961c3db56a423827e83e9760b156 /tools | |
| parent | 503dec99f2e21fba336c989b209fadbf201e6f7e (diff) | |
| parent | 715b9fe052f5a7c622a1f71f905461e06e398de8 (diff) | |
| download | rsyslog-780e2d37e4d27f040d15e09b25542d6808a19436.tar.gz rsyslog-780e2d37e4d27f040d15e09b25542d6808a19436.tar.xz rsyslog-780e2d37e4d27f040d15e09b25542d6808a19436.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
plugins/imrelp/imrelp.c
Diffstat (limited to 'tools')
| -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 */ |