Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-19 | 2 | -4/+4 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix epoll-enabled code to use correct data member for pointers | Rainer Gerhards | 2012-10-19 | 2 | -4/+4 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix: imuxsock did not properly honor $LocalHostIPIF | Rainer Gerhards | 2012-10-19 | 2 | -5/+1 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doc: reflect recent (v5-imported) fix in ChangeLog | Rainer Gerhards | 2012-10-17 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-17 | 3 | -5/+7 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | preparing for 5.10.1v5.10.1 | Rainer Gerhards | 2012-10-17 | 3 | -4/+4 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | imklog: use memmove instead of memcpy (solaris) | Marius Tomaschewski | 2012-10-17 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | imklog: use memmove to remove kernel timestamp | Marius Tomaschewski | 2012-10-17 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | imklog: skip leading spaces in kernel timestamp | Marius Tomaschewski | 2012-10-17 | 1 | -1/+3 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cleanup: removed remains of -c option (compatibility mode) | Rainer Gerhards | 2012-10-16 | 4 | -39/+14 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-16 | 2 | -8/+10 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix: imuxsock truncated head of received message | Rainer Gerhards | 2012-10-16 | 2 | -8/+6 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix problem with cutting first 16 characters from message with bAnnotate on m... | Milan Bartos | 2012-10-10 | 1 | -1/+5 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doc: fix minor small but important typo in ChangeLog | Rainer Gerhards | 2012-10-16 | 1 | -1/+1 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change lumberjack cookie to "@cee" from "@cee " | Rainer Gerhards | 2012-10-11 | 2 | -1/+7 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-04 | 4 | -27/+1 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove cust1 dummy plugin from build system | Rainer Gerhards | 2012-10-04 | 4 | -27/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | build: don't include librsyslog.la in the dist tarball | Michael Biebl | 2012-10-04 | 1 | -2/+1 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doc: add missing files to distribution tarball | Rainer Gerhards | 2012-10-04 | 1 | -0/+15 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix: comments inside objects (e.g. action()) were not properly handled | Rainer Gerhards | 2012-10-04 | 2 | -0/+2 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cosmetic: add few files to .gitignore | Rainer Gerhards | 2012-10-04 | 1 | -0/+15 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-02 | 1 | -2/+2 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | minor: disable debug support in complex1.sh test | Rainer Gerhards | 2012-10-02 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-02 | 3 | -3/+5 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cleanup | Rainer Gerhards | 2012-10-02 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix: fixed wrong bufferlength for snprintf in tcpflood.c | Andre Lorbach | 2012-09-28 | 3 | -3/+5 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-09-26 | 2 | -0/+9 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enable DNS resolution in imrelp | Apollon Oikonomopoulos | 2012-09-26 | 2 | -0/+9 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove no longer needed function | Rainer Gerhards | 2012-09-23 | 1 | -5/+0 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented different grammar for pri filters | Rainer Gerhards | 2012-09-21 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix: some valid legacy PRI filters were flagged as errornous | Rainer Gerhards | 2012-09-21 | 2 | -1/+5 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify | Rainer Gerhards | 2012-09-20 | 1 | -4/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added missing iRet handler code into CheckConnection() in netstrm.c | Andre Lorbach | 2012-09-20 | 1 | -1/+4 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doc: add last bugfix to ChangeLog | Rainer Gerhards | 2012-09-20 | 1 | -0/+5 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing Sysklogd template | Milan Bartos | 2012-09-20 | 1 | -0/+3 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | preparing for 6.4.2 releasev6.4.2 | Rainer Gerhards | 2012-09-20 | 4 | -3/+3 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | testbench: do not run tests requiring root privs if non-root | Rainer Gerhards | 2012-09-20 | 2 | -0/+8 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix: config validation run did not always return correct return state | Rainer Gerhards | 2012-09-20 | 2 | -0/+2 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix: potential abort, if action queue could not be properly started | Rainer Gerhards | 2012-09-19 | 3 | -2/+19 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-09-14 | 1 | -1/+1 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Debug logging slightly improved | Rainer Gerhards | 2012-09-14 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix length calculation for script string constants | Rainer Gerhards | 2012-09-14 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix new testbench test | Rainer Gerhards | 2012-09-14 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add test for script-based contains filter to testbench | Rainer Gerhards | 2012-09-14 | 3 | -0/+20 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing string unescaping (new code from this morning's commit) | Rainer Gerhards | 2012-09-13 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-09-13 | 2 | -78/+87 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix: invalid property name in property-filter could cause abort | Rainer Gerhards | 2012-09-13 | 2 | -56/+67 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix: missing support for escape sequences in RainerScript | Rainer Gerhards | 2012-09-13 | 5 | -2/+162 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | nit: correct messed-up ChangeLog | Rainer Gerhards | 2012-09-12 | 1 | -3/+5 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-09-12 | 2 | -5/+11 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | |