diff options
| author | Michael Biebl <biebl@debian.org> | 2011-05-19 22:53:09 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2011-05-19 22:53:09 +0200 |
| commit | 734f0031f3366c83552de8b0e628949d47ff9487 (patch) | |
| tree | 75cb2c0985c21bc7ffd6d06e94ec7fb420f2a1c4 /tools | |
| parent | 2e96de39e5394008f97d6c194e507e629d836738 (diff) | |
| download | rsyslog-734f0031f3366c83552de8b0e628949d47ff9487.tar.gz | |
Imported Upstream version 5.8.1upstream/5.8.1
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.in | 3 | ||||
| -rw-r--r-- | tools/omfwd.c | 4 | ||||
| -rw-r--r-- | tools/syslogd.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/tools/Makefile.in b/tools/Makefile.in index d803c54..b4532e4 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -219,6 +219,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PGSQL_CFLAGS = @PGSQL_CFLAGS@ PGSQL_LIBS = @PGSQL_LIBS@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PTHREADS_CFLAGS = @PTHREADS_CFLAGS@ PTHREADS_LIBS = @PTHREADS_LIBS@ RANLIB = @RANLIB@ @@ -275,7 +277,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ moddirs = @moddirs@ diff --git a/tools/omfwd.c b/tools/omfwd.c index 38a4a16..10cce0e 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 */ diff --git a/tools/syslogd.c b/tools/syslogd.c index c9734d1..487ab36 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -2172,7 +2172,7 @@ static rsRetVal mainThread() pTmp = template_StdDBFmt; tplAddLine(" StdDBFmt", &pTmp); pTmp = template_StdPgSQLFmt; - tplLastStaticInit(tplAddLine(" StdPgSQLFmt", &pTmp)); + tplAddLine(" StdPgSQLFmt", &pTmp); pTmp = template_spoofadr; tplLastStaticInit(tplAddLine("RSYSLOG_omudpspoofDfltSourceTpl", &pTmp)); |