summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* doc: add imported bugfix to ChangeLogRainer Gerhards2012-10-191-0/+3
|
* Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-192-5/+1
|\
| * bugfix: imuxsock did not properly honor $LocalHostIPIFRainer Gerhards2012-10-192-5/+1
| |
* | Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-176-45/+22
|\|
| * 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
| | |
| * | 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
* | | Merge branch 'v6-stable' into v6-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 v6-betaRainer Gerhards2012-10-112-1/+7
|\| |
| * | 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.
* | | preparing for 6.5.1 releasev6.5.1Rainer Gerhards2012-10-113-3/+3
| | |
* | | remove some assert()'s - valgrind does a better job...Rainer Gerhards2012-10-111-4/+0
| | |
* | | fix small memory leak with string-type templatesRainer Gerhards2012-10-111-0/+1
| | |
* | | fix small memory leak when template is specified in omfileRainer Gerhards2012-10-111-0/+1
| | |
* | | re-enabled commented-out serialization support in debug handlerRainer Gerhards2012-10-111-3/+3
| | |
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-10-045-29/+2
|\| |
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-044-27/+1
| |\|
| | * remove cust1 dummy plugin from build systemRainer Gerhards2012-10-044-27/+1
| | | | | | | | | | | | | | | | | | | | | Thanks to Michael Biebl for identifying this as the culprit for several build-related issues. The plugin is a placeholder, and was not used for quite some while. It is definitely not worth the effort to keep it along. If needed, can be quickly created.
| * | build: don't include librsyslog.la in the dist tarballMichael Biebl2012-10-041-2/+1
| | | | | | | | | | | | libtool archives are not meant to be shipped in the source tarball.
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-10-044-0/+32
|\| |
| * | doc: add missing files to distribution tarballRainer Gerhards2012-10-041-0/+15
| | | | | | | | | | | | Thanks to Michael Biebl for alerting me of the problem.
| * | bugfix: comments inside objects (e.g. action()) were not properly handledRainer Gerhards2012-10-042-0/+2
| | |
| * | cosmetic: add few files to .gitignoreRainer Gerhards2012-10-041-0/+15
| | |
* | | integrate logctl into build processRainer Gerhards2012-10-024-456/+482
| | |
* | | add new tool "logctl" to access lumberjack logs in MongoDBUlrike Gerhards2012-10-021-0/+456
| | |
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-10-022-1/+3
|\| |
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-021-2/+2
| |\|
| | * minor: disable debug support in complex1.sh testRainer Gerhards2012-10-021-2/+2
| | |
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-023-3/+5
| |\|
| | * cleanupRainer Gerhards2012-10-021-1/+1
| | |
| | * bugfix: fixed wrong bufferlength for snprintf in tcpflood.cAndre Lorbach2012-09-283-3/+5
| | | | | | | | | | | | | | | The problem occured when using the -f (dynafiles) option, and caused some tests to fail.
* | | Merge branch 'v6-devel-input' into v6-develRainer Gerhards2012-09-288-153/+578
|\ \ \
| * | | doc: update module doc to new config formatFlorian Riedl2012-09-285-107/+373
| | | |
| * | | imtcp: implement support for module() parametersRainer Gerhards2012-09-281-38/+135
| | | |
| * | | imptcp: implement support for module() parametersRainer Gerhards2012-09-271-7/+70
| | | |
| * | | fix whitespace issueRainer Gerhards2012-09-271-1/+0
| | | |
* | | | Merge branch 'v6-devel-input' into v6-develRainer Gerhards2012-09-2716-244/+1173
|\| | |
| * | | Do not load module if it had errorneous parametersRainer Gerhards2012-09-273-12/+58
| | | |
| * | | cosmetic: remove irrelevant compiler warningRainer Gerhards2012-09-271-1/+1
| | | | | | | | | | | | | | | | v7 does not even have this code any longer
| * | | bugfix: config errors did not always cause statement to failRainer Gerhards2012-09-274-28/+114
| | | | | | | | | | | | | | | | This could lead to startup with invalid parameters.
| * | | imfile: implement support for module parameters via module() stmtRainer Gerhards2012-09-272-9/+80
| | | |
| * | | yet another nitfix...Rainer Gerhards2012-09-271-1/+1
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-07 19:25:59 +0000