summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 '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
| |
* | 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.
* | 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.
* | 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
| |
* | 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 'v5-stable' into v6-stableRainer Gerhards2012-09-262-0/+9
|\| | | | | | | | | Conflicts: plugins/imrelp/imrelp.c
| * enable DNS resolution in imrelpApollon Oikonomopoulos2012-09-262-0/+9
| |
* | Remove no longer needed functionRainer Gerhards2012-09-231-5/+0
| | | | | | | | | | | | Thanks to Andreas Stieger from Novell/SUSE for alerting us. This function was introduced as part of the new config system, but never was actually used (aka "not needed").
* | Implemented different grammar for pri filtersRainer Gerhards2012-09-211-1/+1
| | | | | | | | | | | | | | | | The method introduced by the previous commit caused issues in v7 as it was too generic. Most importantly, it permitted simple words (like "stop") to (invalidly) be detected as pri filters. Now, the grammar is close to the initial one, and each pri filter must at least have a comma or a period inside it, which does not conflict with simple words.
* | bugfix: some valid legacy PRI filters were flagged as errornousRainer Gerhards2012-09-212-1/+5
| | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=358 This happend to filters of the style "local0,local1.*", where the multiple facilities were comma-separated.
* | SimplifyRainer Gerhards2012-09-201-4/+1
| |
* | Added missing iRet handler code into CheckConnection() in netstrm.cAndre Lorbach2012-09-201-1/+4
| |
* | doc: add last bugfix to ChangeLogRainer Gerhards2012-09-201-0/+5
| |
* | Fix missing Sysklogd templateMilan Bartos2012-09-201-0/+3
| | | | | | | | modified: runtime/rsconf.c
* | preparing for 6.4.2 releasev6.4.2Rainer Gerhards2012-09-204-3/+3
| |
* | testbench: do not run tests requiring root privs if non-rootRainer Gerhards2012-09-202-0/+8
| |
* | bugfix: config validation run did not always return correct return stateRainer Gerhards2012-09-202-0/+2
| |
* | bugfix: potential abort, if action queue could not be properly startedRainer Gerhards2012-09-193-2/+19
| | | | | | | | This most importantly could happen due to configuration errors.
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-141-1/+1
|\|
| * Debug logging slightly improvedRainer Gerhards2012-09-141-1/+1
| |
* | Fix length calculation for script string constantsRainer Gerhards2012-09-141-2/+2
| | | | | | | | | | | | This could lead to various problems, like if-filters not working. Note this is a regression from yesterdays escape fix, so there exist no released version with this problem.
* | Fix new testbench testRainer Gerhards2012-09-141-1/+1
| |
* | Add test for script-based contains filter to testbenchRainer Gerhards2012-09-143-0/+20
| |
* | Fixing string unescaping (new code from this morning's commit)Rainer Gerhards2012-09-131-1/+1
| |
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-132-78/+87
|\| | | | | | | | | Conflicts: runtime/rule.c
| * bugfix: invalid property name in property-filter could cause abortRainer Gerhards2012-09-132-56/+67
| | | | | | | | | | | | ...if action chaining (& operator) was used http://bugzilla.adiscon.com/show_bug.cgi?id=355 Thanks to pilou@gmx.com for the bug report
* | bugfix: missing support for escape sequences in RainerScriptRainer Gerhards2012-09-135-2/+162
| | | | | | | | | | | | | | Only \' was supported. Now the usual set is supported. Note that v5 used \x as escape where x was any character (e.g. "\n" meant "n" and NOT LF). This also means there is some incompatibility to v5 for well-know sequences. Better break it now than later.
* | nit: correct messed-up ChangeLogRainer Gerhards2012-09-121-3/+5
| |
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-122-5/+11
|\| | | | | | | | | Conflicts: ChangeLog
| * remove unused variables (if SCM_CREDENTIALS is not available)Cristian Ionescu-Idbohrn2012-09-122-1/+9
| |
| * imuxsock: remove incorrect socket option callCristian Ionescu-Idbohrn2012-09-121-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SCM_CREDENTIALS is not a socket option; its value is usually 0x2 which on most archs corresponds to socket option SO_REUSEADDR, but on mips-arch there is no socket option with value 0x2 and SO_REUSEADDR = 0x4, so the call will fail with ENOPROTOOPT 'Protocol not available'; skip it. There does not seem any other special setsockopt call is needed anyway, besides the above. In addition Jonny Törnbom commented: SCM_CREDENTIALS is a control message type, not a socket option, so using setsockopt(...SCM_CREDENTIALS...) is potentially dangerous and wrong and should be deleted from the code. (SCM_CREDENTIALS is used in conjuction with SO_PASSCRED which is the socket option to use.)
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-111-3/+1
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-06 16:18:43 +0000