Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | bugfix: invalid rsyslog-internal macro API use | Rainer Gerhards | 2012-11-01 | 8 | -8/+8 |
| | | | | | This had no bad effect, because the macro did the same as the one that should have been used. | ||||
* | bugfix: misaddressing of $mmnormalizeuserawmsg parameter | Rainer Gerhards | 2012-11-01 | 1 | -1/+1 |
| | | | | | | On many platforms, this has no effect at all. At some, it may cause a segfault. The problem occurs only during config phase, no segfault happens when rsyslog has fully started. | ||||
* | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-19 | 1 | -2/+2 |
|\ | |||||
| * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-19 | 1 | -2/+2 |
| |\ | | | | | | | | | | | | | Conflicts: runtime/nsdpoll_ptcp.c | ||||
| | * | fix epoll-enabled code to use correct data member for pointers | Rainer Gerhards | 2012-10-19 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-19 | 1 | -5/+0 |
|\| | | |||||
| * | | bugfix: imuxsock did not properly honor $LocalHostIPIF | Rainer Gerhards | 2012-10-19 | 1 | -5/+0 |
| | | | |||||
* | | | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-17 | 2 | -3/+5 |
|\| | | |||||
| * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-17 | 2 | -3/+5 |
| |\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | 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 |
| | | | |||||
* | | | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-16 | 1 | -8/+2 |
|\| | | |||||
| * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-16 | 1 | -8/+2 |
| |\| | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c | ||||
| | * | bugfix: imuxsock truncated head of received message | Rainer Gerhards | 2012-10-16 | 1 | -8/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Bartos | 2012-10-10 | 1 | -1/+5 |
| | | | | | | | | | | | | modified: plugins/imuxsock/imuxsock.c | ||||
* | | | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-11 | 1 | -1/+1 |
|\| | | |||||
| * | | change lumberjack cookie to "@cee" from "@cee " | Rainer Gerhards | 2012-10-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'v6-stable' into v6-devel | Rainer Gerhards | 2012-10-04 | 1 | -6/+0 |
|\| | | |||||
| * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-04 | 1 | -6/+0 |
| |\| | |||||
| | * | remove cust1 dummy plugin from build system | Rainer Gerhards | 2012-10-04 | 1 | -6/+0 |
| | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | imtcp: implement support for module() parameters | Rainer Gerhards | 2012-09-28 | 1 | -38/+135 |
| | | | |||||
* | | | imptcp: implement support for module() parameters | Rainer Gerhards | 2012-09-27 | 1 | -7/+70 |
| | | | |||||
* | | | fix whitespace issue | Rainer Gerhards | 2012-09-27 | 1 | -1/+0 |
| | | | |||||
* | | | bugfix: config errors did not always cause statement to fail | Rainer Gerhards | 2012-09-27 | 1 | -7/+2 |
| | | | | | | | | | | | | This could lead to startup with invalid parameters. | ||||
* | | | imfile: implement support for module parameters via module() stmt | Rainer Gerhards | 2012-09-27 | 1 | -9/+77 |
| | | | |||||
* | | | yet another nitfix... | Rainer Gerhards | 2012-09-27 | 1 | -1/+1 |
| | | | |||||
* | | | nitfix | Rainer Gerhards | 2012-09-27 | 1 | -2/+2 |
| | | | |||||
* | | | imfile: implement support for input() | Rainer Gerhards | 2012-09-27 | 1 | -3/+78 |
| | | | |||||
* | | | milestone: port imfile to v6 config system | Rainer Gerhards | 2012-09-26 | 2 | -149/+279 |
| | | | |||||
* | | | imrelp: implement support for input() | Rainer Gerhards | 2012-09-26 | 1 | -10/+76 |
| | | | |||||
* | | | imudp: implement support for input() | Rainer Gerhards | 2012-09-26 | 2 | -9/+84 |
| | | | |||||
* | | | imptcp: implement support for input() | Rainer Gerhards | 2012-09-26 | 2 | -15/+119 |
| | | | |||||
* | | | imtcp: implement support for input() | Rainer Gerhards | 2012-09-26 | 1 | -10/+89 |
| | | | |||||
* | | | Implement input() support in imuxsock | Rainer Gerhards | 2012-09-26 | 1 | -10/+119 |
| | | | |||||
* | | | Merge branch 'v6-stable' into v6-devel-input | Rainer Gerhards | 2012-09-26 | 1 | -0/+7 |
|\| | | |||||
| * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-09-26 | 1 | -0/+7 |
| |\| | | | | | | | | | | | | | Conflicts: plugins/imrelp/imrelp.c | ||||
| | * | enable DNS resolution in imrelp | Apollon Oikonomopoulos | 2012-09-26 | 1 | -0/+7 |
| | | | |||||
* | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-20 | 1 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | preparing for 6.4.2 releasev6.4.2 | Rainer Gerhards | 2012-09-20 | 1 | -0/+0 |
| | | | |||||
* | | | bugfix: small memory leak in imdiag | Rainer Gerhards | 2012-09-20 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | This does not have any practical problems associated with it, EXCECPT that it caused almost all valgrind testbench tests to fail. | ||||
* | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-12 | 1 | -8/+6 |
|\| | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-09-12 | 1 | -5/+5 |
| |\| | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | remove unused variables (if SCM_CREDENTIALS is not available) | Cristian Ionescu-Idbohrn | 2012-09-12 | 1 | -1/+5 |
| | | | |||||
| | * | imuxsock: remove incorrect socket option call | Cristian Ionescu-Idbohrn | 2012-09-12 | 1 | -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-stable | Rainer Gerhards | 2012-09-11 | 1 | -3/+1 |
| |\| | |||||
| | * | fix compile problem on FreeBSD | Brad Davis | 2012-09-11 | 1 | -3/+1 |
| | | | |||||
| * | | Remove a no-effect ", NULL"; | Miloslav Trmač | 2012-08-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | It does nothing, at is just confusing. Signed-off-by: Miloslav Trmač <mitr@redhat.com> | ||||
* | | | milestone: ommongodb supports templates & JSON passing API in place | Rainer Gerhards | 2012-08-29 | 1 | -15/+8 |
| | | | |||||
* | | | adapted Mirek's changes to new JSON passing mode | Rainer Gerhards | 2012-08-29 | 2 | -47/+26 |
| | | | | | | | | | | | | | | | now the complete code (JSON passing & ommongodb) could be tested and passed the module tests made during development |