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/syslogd.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/syslogd.c')
| -rw-r--r-- | tools/syslogd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index 44c88624..bab37966 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -2167,7 +2167,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)); |