diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-12-16 13:59:16 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-12-16 13:59:16 +0100 |
| commit | 189a26c0444178612bf6e4618ccd9c722b83c261 (patch) | |
| tree | 243d27b68a14ebcd2c7263a3492ace23542c5f13 /tools | |
| parent | c5611012f9d82155d6017435b5cf52c0b4e31149 (diff) | |
| parent | 371a8eec29fa25bbf58f4b1f0d7e3bf4c3ad6329 (diff) | |
| download | rsyslog-189a26c0444178612bf6e4618ccd9c722b83c261.tar.gz rsyslog-189a26c0444178612bf6e4618ccd9c722b83c261.tar.xz rsyslog-189a26c0444178612bf6e4618ccd9c722b83c261.zip | |
Merge branch 'v4-stable' into v5-stable
Conflicts:
ChangeLog
runtime/parser.c
runtime/queue.c
runtime/wtp.c
template.c
threads.c
tools/syslogd.c
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/omfile.c | 1 | ||||
| -rw-r--r-- | tools/omfwd.c | 2 | ||||
| -rw-r--r-- | tools/omusrmsg.c | 1 | ||||
| -rw-r--r-- | tools/rsyslog.conf.5 | 4 |
4 files changed, 2 insertions, 6 deletions
diff --git a/tools/omfile.c b/tools/omfile.c index 78f2bf8e..8c507a56 100644 --- a/tools/omfile.c +++ b/tools/omfile.c @@ -404,7 +404,6 @@ prepareFile(instanceData *pData, uchar *newFileName) } } else { /* file does not exist, create it (and eventually parent directories */ - fd = -1; if(pData->bCreateDirs) { /* We first need to create parent dirs if they are missing. * We do not report any errors here ourselfs but let the code diff --git a/tools/omfwd.c b/tools/omfwd.c index 481fabab..487bb35a 100644 --- a/tools/omfwd.c +++ b/tools/omfwd.c @@ -515,7 +515,6 @@ finalize_it: BEGINparseSelectorAct uchar *q; int i; - int bErr; rsRetVal localRet; struct addrinfo; TCPFRAMINGMODE tcp_framing = TCP_FRAMING_OCTET_STUFFING; @@ -638,7 +637,6 @@ CODE_STD_STRING_REQUESTparseSelectorAct(1) } /* now skip to template */ - bErr = 0; while(*p && *p != ';' && *p != '#' && !isspace((int) *p)) ++p; /*JUST SKIP*/ diff --git a/tools/omusrmsg.c b/tools/omusrmsg.c index e61751dc..768baca7 100644 --- a/tools/omusrmsg.c +++ b/tools/omusrmsg.c @@ -249,7 +249,6 @@ static rsRetVal wallmsg(uchar* pMsg, instanceData *pData) } } close(ttyf); - ttyf = -1; } } diff --git a/tools/rsyslog.conf.5 b/tools/rsyslog.conf.5 index e8a4ab92..e17da974 100644 --- a/tools/rsyslog.conf.5 +++ b/tools/rsyslog.conf.5 @@ -200,11 +200,11 @@ to overwrite the preceding ones. Using this behavior you can exclude some priorities from the pattern. Rsyslogd has a syntax extension to the original BSD source, that makes its use -more intuitively. You may precede every priority with an equation sign ('=') to +more intuitively. You may precede every priority with an equals sign ('=') to specify only this single priority and not any of the above. You may also (both is valid, too) precede the priority with an exclamation mark ('!') to ignore all that priorities, either exact this one or this and any higher priority. If -you use both extensions than the exclamation mark must occur before the equation +you use both extensions than the exclamation mark must occur before the equals sign, just use it intuitively. .SH ACTIONS |