summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* disable deprecated warnings in omdiscard/omrulesetRainer Gerhards2012-10-222-0/+8
| | | | | | | | | ... because action-like statements in action lists are not supported in 7.1. This will be available in 7.3, but it is too late to do this in 7.1. So we disable the warnings and re-enable them in 7.3. Functionality- wise, this is no problem at all as the legacy constructs are still fully supported. Thanks to forum user "canadaboy" for mentioning this problem.
* doc: remove BSD blocks from rsyslog.conf manpageRainer Gerhards2012-10-221-8/+1
| | | | | Thanks to Michael Biebl for mentioning this. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=364
* Merge branch 'v6-stable' into betaRainer Gerhards2012-10-221-1/+1
|\
| * Merge branch 'v5-stable' into v6-stablev6.4.3.unfinishedRainer Gerhards2012-10-221-1/+1
| |\
| | * doc: v3 compatibility doc lists invalid config directiveRainer Gerhards2012-10-221-1/+1
| | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=365
* | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-192-4/+4
|\| |
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-192-4/+4
| |\| | | | | | | | | | | | | Conflicts: runtime/nsdpoll_ptcp.c
| | * fix epoll-enabled code to use correct data member for pointersRainer Gerhards2012-10-192-4/+4
| | |
* | | doc: add imported bugfix to ChangeLogRainer Gerhards2012-10-191-2/+3
| | | | | | | | | | | | plus some cleanup
* | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-192-5/+1
|\| |
| * | bugfix: imuxsock did not properly honor $LocalHostIPIFRainer Gerhards2012-10-192-5/+1
| | |
* | | preparing for 7.1.12 releasev7.1.12Rainer Gerhards2012-10-183-3/+5
| | |
* | | build: Remove vestiges of the cust1 pluginMichael Biebl2012-10-181-1/+0
| | |
* | | build: Drop unused include pathMichael Biebl2012-10-181-1/+1
| | |
* | | build: Drop unused CNF_LIBS variableMichael Biebl2012-10-182-3/+2
| | |
* | | build: Use pkg-config to check for libcurlMichael Biebl2012-10-181-19/+1
| | | | | | | | | | | | curl has shipped that file since 2004.
* | | build: Use pkg-config to check for libuuidMichael Biebl2012-10-181-16/+1
| | | | | | | | | | | | | | | e2fsprogs resp. util-linux(-ng) have shipped that file since at least 2009.
* | | build: Don't call AC_SUBST for variables defined by PKG_CHECK_MODULESMichael Biebl2012-10-181-21/+0
| | | | | | | | | | | | | | | | | | | | | Newer versions of pkg-config do that already. According to pkg-config upstream this change was made around 2005, so it should be rather safe. This change doesn't affect users building from dist tarballs anyway but only if you are building from a Git checkout.
* | | doc: typo fixRainer Gerhards2012-10-171-1/+1
| | |
* | | doc: add (v5-imported) imklog bugfix to ChangeLogRainer Gerhards2012-10-171-0/+3
| | |
* | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-173-6/+8
|\| |
| * | doc: reflect recent (v5-imported) fix in ChangeLogRainer Gerhards2012-10-171-1/+1
| | |
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-173-5/+7
| |\| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * preparing for 5.10.1v5.10.1Rainer Gerhards2012-10-173-4/+4
| | |
| | * imklog: use memmove instead of memcpy (solaris)Marius Tomaschewski2012-10-171-1/+1
| | |
| | * imklog: use memmove to remove kernel timestampMarius Tomaschewski2012-10-171-1/+1
| | |
| | * imklog: skip leading spaces in kernel timestampMarius Tomaschewski2012-10-171-1/+3
| | |
* | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-163-38/+17
|\| | | | | | | | | | | | | | Conflicts: rsyslog.service.in
| * | cleanup: removed remains of -c option (compatibility mode)Rainer Gerhards2012-10-164-39/+14
| | | | | | | | | | | | | | | | | | both from code & doc and emitted warning message if still used closes: http://bugzilla.adiscon.com/show_bug.cgi?id=361 Thanks to Michael Biebl for reporting & suggestions
* | | doc: mention recent patches in ChangeLogRainer Gerhards2012-10-161-3/+7
| | |
* | | systemd: Remove obsolete ExecStartPre commandMichael Biebl2012-10-161-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | With the introduction of the journal in systemd v38 [1], the systemd-kmsg-syslogd.service service was removed. All major distributions which ship systemd use v44 or later in their current releases, so it seems safe to drop the ExecStartPre command. [1] http://lists.freedesktop.org/archives/systemd-devel/2012-January/004188.html
* | | systemd: Drop obsolete compatibility flagMichael Biebl2012-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | | In v6 [1], the compatibility mode has been removed and -c is a basically a no-op. So just drop that obsolete command line flag. [1] http://www.rsyslog.com/doc/v6compatibility.html
* | | prepare for version 7.1.11v7.1.11Rainer Gerhards2012-10-163-4/+8
| | |
* | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-162-9/+11
|\| |
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-162-8/+10
| |\| | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c
| | * bugfix: imuxsock truncated head of received messageRainer Gerhards2012-10-162-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This happened only under some circumstances. Thanks to Marius Tomaschwesky, Florian Piekert and Milan Bartos for their help in solving this issue. Note that Milan sent a patch, which solved the problem under some conditions (can be found somewhat earlier in git history). However, it did not handle the original root cause, and so did not fix the problem always. The main reason was that the date parser modifies the provided lenghts. That part of the API was not properly used by the caller (who decremented the length once more).
| | * fix problem with cutting first 16 characters from message with bAnnotate on ↵Milan Bartos2012-10-101-1/+5
| | | | | | | | | | | | modified: plugins/imuxsock/imuxsock.c
| * | doc: fix minor small but important typo in ChangeLogRainer Gerhards2012-10-161-1/+1
| | |
* | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-111-0/+12
|\| | | | | | | | | | | | | | Conflicts: plugins/mmjsonparse/mmjsonparse.c
| * | change lumberjack cookie to "@cee" from "@cee "Rainer Gerhards2012-10-112-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | CEE originally specified the cookie with SP, whereas other lumberjack tools used it without space. In order to keep interop with lumberjack, we now use the cookie without space as well. I hope this can be changed in CEE as well when it is released at a later time. Thanks to Miloslav Trmač for pointing this out and a similiar v7 patch.
* | | Don't require the trailing space in @cee: cookieMiloslav Trmač2012-10-111-1/+1
| | | | | | | | | | | | | | | | | | The only mention of @cee: in the Lumberjack pages, https://fedorahosted.org/lumberjack/wiki/FieldList doesn't have a space, and libumberlog does not in fact generate one.
* | | doc: add last patch to ChangeLogRainer Gerhards2012-10-111-0/+2
| | |
* | | Fix crash when date properties are used without a templateMiloslav Trmač2012-10-111-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | E.g. in > set $!time = $timereported; > set $!time_rcvd = $timegenerated; pTpe is set to NULL by the caller. (Is "default" the correct format to use?) Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | | add deprecated note to discard actionRainer Gerhards2012-10-113-1/+25
| | |
* | | added deprecated note to omrulesetRainer Gerhards2012-10-113-0/+10
| | |
* | | make omruleset non-default in ./configureRainer Gerhards2012-10-111-1/+1
| | | | | | | | | | | | | | | | | | as this module's functionality has been superseeded by the "call" statement. Thanks to Michael Biebl for alerting me on the still-old default.
* | | preparing for 7.1.10 releasev7.1.10Rainer Gerhards2012-10-112-2/+2
| | |
* | | fix regression introduced by last commitRainer Gerhards2012-10-111-1/+1
| | | | | | | | | | | | action object was created twice, resulting in memleak
* | | bugfixes in regards to action()Rainer Gerhards2012-10-112-0/+4
| | | | | | | | | | | | | | | - bugfix: small memory leak when processing action() statements - bugfix: unknown action() parameters were not reported
* | | bugfix: some config processing warning messages were treated as errorsRainer Gerhards2012-10-112-2/+7
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-30 15:05:01 +0000