| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|/ /
| |
| |
| |
| | |
(and template name set to "??" if the parameter was used)
Thanks to Brian Knox for alerting us on this bug.
|
| | |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
ChangeLog
configure.ac
doc/manual.html
plugins/imfile/imfile.c
plugins/imklog/imklog.c
plugins/immark/immark.c
plugins/imptcp/imptcp.c
plugins/imrelp/imrelp.c
plugins/imtcp/imtcp.c
plugins/imtemplate/imtemplate.c
plugins/imudp/imudp.c
plugins/imuxsock/imuxsock.c
plugins/mmsnmptrapd/mmsnmptrapd.c
plugins/omtemplate/omtemplate.c
runtime/glbl.c
runtime/parser.c
tools/omfile.c
tools/syslogd.c
|
| | |
| | |
| | |
| | | |
The most common files are now changed, more needs to be done.
|
| |\|
| | |
| | |
| | |
| | | |
Conflicts:
plugins/imtcp/imtcp.c
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
ChangeLog
configure.ac
doc/manual.html
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
ChangeLog
configure.ac
doc/manual.html
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/rsyslog.h
|
|\ \ \ \ \ \
| | |_|_|_|/
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
ChangeLog
action.h
configure.ac
doc/manual.html
plugins/immark/immark.c
plugins/impstats/impstats.c
plugins/imptcp/imptcp.c
plugins/imtcp/imtcp.c
runtime/cfsysline.c
runtime/cfsysline.h
runtime/conf.c
runtime/ctok.c
runtime/ctok.h
runtime/ctok_token.c
runtime/ctok_token.h
runtime/dnscache.h
runtime/expr.c
runtime/expr.h
runtime/rule.c
runtime/rule.h
runtime/ruleset.h
runtime/sysvar.c
runtime/vm.h
runtime/vmop.c
runtime/vmop.h
runtime/vmprg.c
runtime/vmprg.h
runtime/vmstk.c
runtime/vmstk.h
tools/omusrmsg.c
|
| |\ \ \ \ \
| | |_|_|_|/
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
plugins/imfile/imfile.c
plugins/omtesting/omtesting.c
tcpsrv.c
threads.c
|
| | | | | | |
|
|\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
ChangeLog
|
| |\| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/rsyslog.h
|
| | | |_|_|/
| | |/| | | |
|
| | | | | | |
|
|\| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/conf.c
tools/omfile.c
tools/omusrmsg.c
|
| |\| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/rsyslog.h
tools/omfile.c
tools/ompipe.c
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
previously, RS_RET_RESUME was returned, which lead to a loop inside the
rule engine as omfile could not really recover.
|
| | |\| | |
| | | |_|/
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
NOTE: this merge has problems, to be fixed with follow-up commits
If file creation fails due to out of memory, we can enter a tight loop.
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/parser.c
runtime/rsyslog.h
tests/Makefile.am
tests/tcpflood.c
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
dynafile cache exhausts address space (primarily a problem on 32 bit
platforms)
|
| | | |\ \ |
|
| | | | | | |
|
| | | | |\ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
ChangeLog
configure.ac
doc/manual.html
|
| | | | |\ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
runtime/parser.c
|
| | | | | | | | |
|
| | | | |_|/ /
| | | |/| | | |
|
| | | | | | | |
|
| | | | | | | |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
but not all syntax handlers are present (so it does not yet
fully work).
|
| | | | | | | |
|
| | | | | | | |
|
| | | | | | | |
|
|\| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/rsyslog.h
|
| |\| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/rsyslog.h
|
| | | | | | | |
|
| | |\| | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
ChangeLog
configure.ac
doc/manual.html
tests/diag.sh
|
| | | | |/ /
| | | |/| | |
|
| | | | | | |
|
|\ \ \ \ \ \
| | |_|_|_|/
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
ChangeLog
configure.ac
doc/manual.html
tests/Makefile.am
tests/manytcp-too-few-tls.sh
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=262
|
| | | | | | |
|
|\ \ \ \ \ \
| | |/ / / /
| |/| | | |
| | | | | |
| | | | | | |
Conflicts:
tools/omfile.c
|
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This make the privilege drop code more bulletproof, but breaks Ubuntu's
work-around for log files created by external programs with the wrong
user and/or group. Note that it was long said that this "functionality"
would break once we go for serious privilege drop code, so hopefully
nobody still depends on it (and, if so, they lost...).
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
too many dependencies, things get cluttered (and merging probably
gets problematic). Now new config will be "conf2".
|
| |/ / /
|/| | | |
|
|\| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
ChangeLog
configure.ac
doc/manual.html
plugins/omlibdbi/omlibdbi.c
tests/Makefile.am
tests/diag.sh
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The capability has been added for module to specify that they do not
like being unloaded.
related bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=222
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
|
|\| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
ChangeLog
action.c
plugins/imudp/imudp.c
runtime/glbl.c
|
| |\| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
ChangeLog
runtime/parser.c
runtime/queue.c
runtime/wtp.c
template.c
threads.c
tools/syslogd.c
|
| | | | |
|