summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-162-8/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix: imuxsock truncated head of received messageRainer Gerhards2012-10-162-8/+6
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix problem with cutting first 16 characters from message with bAnnotate on m...Milan Bartos2012-10-101-1/+5
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-044-27/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove cust1 dummy plugin from build systemRainer Gerhards2012-10-044-27/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | build: don't include librsyslog.la in the dist tarballMichael Biebl2012-10-041-2/+1
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doc: add missing files to distribution tarballRainer Gerhards2012-10-041-0/+15
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-262-0/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enable DNS resolution in imrelpApollon Oikonomopoulos2012-09-262-0/+9
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove no longer needed functionRainer Gerhards2012-09-231-5/+0
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented different grammar for pri filtersRainer Gerhards2012-09-211-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix: some valid legacy PRI filters were flagged as errornousRainer Gerhards2012-09-212-1/+5
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
|\| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix: invalid property name in property-filter could cause abortRainer Gerhards2012-09-132-56/+67
* | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix: missing support for escape sequences in RainerScriptRainer Gerhards2012-09-135-2/+162
* | | | | | | | | | | | | | | | | | | | | | | | | | | | nit: correct messed-up ChangeLogRainer Gerhards2012-09-121-3/+5
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-122-5/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-111-3/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | fix compile problem on FreeBSDBrad Davis2012-09-111-3/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | preparing for 6.4.1 releasev6.4.1Rainer Gerhards2012-09-064-7/+9
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Fixed TCP CheckConnection handling in omfwd.c.Andre Lorbach2012-08-257-9/+30
* | | | | | | | | | | | | | | | | | | | | | | | | bugfix: omusrsmsg incorrect return state & config warning handlingRainer Gerhards2012-08-283-2/+26
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | |