Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-08-31 | 1 | -0/+1 |
|\ | |||||
| * | bugfix: mark message processing did not work correctly | Rainer Gerhards | 2011-08-31 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'v4-beta' into v5-devel | Rainer Gerhards | 2011-08-30 | 1 | -0/+12 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h | ||||
| * \ | Merge branch 'v4-stable' into v4-beta | Rainer Gerhards | 2011-08-30 | 1 | -3/+5 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | Added changelog entry | Andre Lorbach | 2011-08-11 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch 'v4-stable' into v4-beta | Andre Lorbach | 2011-08-11 | 1 | -0/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'v4-stable' into v4-beta | Rainer Gerhards | 2011-08-09 | 1 | -0/+3 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'v4-stable' into v4-beta | Andre Lorbach | 2011-08-05 | 1 | -0/+7 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | | | | preparing for 4.7.4v4.7.4 | Rainer Gerhards | 2011-07-11 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'v4-stable' into v4-devel | Rainer Gerhards | 2011-07-11 | 1 | -3/+15 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
* | \ \ \ \ \ \ | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-08-30 | 1 | -4/+8 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-08-30 | 1 | -3/+6 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tools/syslogd.c | ||||
| | * | | | | | | added bug info to ChangeLog | Rainer Gerhards | 2011-08-30 | 1 | -2/+3 |
| | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | Added MsgDup bugfix from v5-stable into v4-stable branch | Andre Lorbach | 2011-08-11 | 1 | -0/+1 |
| | | |_|_|/ | | |/| | | | |||||
* | | | | | | Merge branch 'v5-stable' into v5-devel | Andre Lorbach | 2011-08-18 | 1 | -0/+3 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac | ||||
| * | | | | | bugfix: fixed incorrect state handling for Discard Action (transactions) | Andre Lorbach | 2011-08-18 | 1 | -0/+3 |
| | | | | | | |||||
* | | | | | | Merge branch 'v5-stable' into v5-devel | Andre Lorbach | 2011-08-16 | 1 | -1/+3 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac | ||||
| * | | | | | bugfixes for tag emulation | Rainer Gerhards | 2011-08-11 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - bugfix: potential hang condition during tag emulation - bugfix: too-early string termination during tag emulation | ||||
* | | | | | | Merge branch 'v5-stable' into v5-devel | Andre Lorbach | 2011-08-11 | 1 | -1/+5 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | | | | fixed typo in changelog | Andre Lorbach | 2011-08-10 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | added changelog entry | Andre Lorbach | 2011-08-10 | 1 | -0/+3 |
| | | | | | | |||||
| * | | | | | preparing for version 5.8.4v5.8.4 | root | 2011-08-10 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge branch 'v5-devel' of git+ssh://al@git.adiscon.com/git/rsyslog into ↵ | Andre Lorbach | 2011-08-10 | 1 | -0/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | v5-devel | ||||
| * \ \ \ \ \ | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-08-09 | 1 | -0/+6 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | added capability to emit config error location info for warnings | Rainer Gerhards | 2011-08-09 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | otherwise, omusrmsg's warning about new config format was not accompanied by problem location. | ||||
* | | | | | | | | Added changelog entry for bugid 275 | Andre Lorbach | 2011-08-10 | 1 | -0/+2 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'v5-stable' into v5-devel | Andre Lorbach | 2011-08-10 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Added changelog entry for bugid 275 | Andre Lorbach | 2011-08-10 | 1 | -0/+3 |
| |/ / / / / | |||||
| * | | | | | cosmetic: add imported bugfix to ChangeLog | Rainer Gerhards | 2011-08-09 | 1 | -0/+3 |
| | | | | | | |||||
| * | | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-08-09 | 1 | -0/+3 |
| |\| | | | | |||||
| | * | | | | bugfix: memcpy overflow can occur in allowed sender checking | Marius Tomaschewski | 2011-08-09 | 1 | -0/+3 |
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | ...if a host name is resolved to IPv4-mapped-on-IPv6 address. Found by Ismail Dönmez at suse. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
* | | | | | Merge branch 'v5-stable' into v5-devel | Andre Lorbach | 2011-08-05 | 1 | -0/+10 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | | Merge branch 'v4-stable' into v5-stable | Andre Lorbach | 2011-08-05 | 1 | -0/+4 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | | | Merge branch 'v3-stable' into v4-stable | Andre Lorbach | 2011-08-05 | 1 | -0/+4 |
| | |\ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | Conflicts: runtime/msg.c | ||||
| | | * | | bugfix: potential misadressing in property replacer | Andre Lorbach | 2011-08-05 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Added changelog entry | Andre Lorbach | 2011-08-05 | 1 | -0/+3 |
| | | | | | |||||
* | | | | | preparing for 5.9.2v5.9.2 | Rainer Gerhards | 2011-07-11 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-07-11 | 1 | -2/+9 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h | ||||
| * | | | | preparing for 5.8.3v5.8.3 | Rainer Gerhards | 2011-07-11 | 1 | -1/+4 |
| | | | | | |||||
| * | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-07-11 | 1 | -1/+3 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/diag.sh | ||||
| | * | | | preparing for 4.6.7 releasev4.6.7 | Rainer Gerhards | 2011-07-11 | 1 | -1/+2 |
| | | | | | |||||
* | | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-07-06 | 1 | -1/+11 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/manual.html | ||||
| * | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-07-06 | 1 | -1/+5 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | | | added support for the ":omusrmsg:" syntax in configuring user messages | Rainer Gerhards | 2011-07-06 | 1 | -0/+3 |
| | | | | | |||||
| | * | | | preparing for 4.6.6v4.6.6 | Rainer Gerhards | 2011-06-24 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | doc: mentioned Lennart's patch in ChangeLog | Rainer Gerhards | 2011-07-02 | 1 | -0/+3 |
| | | | | | |||||
* | | | | | preparing for 5.9.1 releasev5.9.1 | Rainer Gerhards | 2011-06-30 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | added support for obtaining timestamp for kernel message from message | Rainer Gerhards | 2011-06-24 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the kernel time-stamps messages, time is now take from that timestamp instead of the system time when the message was read. This provides much better accuracy. Thanks to Lennart Poettering for suggesting this feature and his help during implementation. | ||||
* | | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-06-21 | 1 | -2/+24 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | | | bugfix: mutex was invalidly left unlocked during action processingv5.8.2 | Rainer Gerhards | 2011-06-21 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At least one case where this can occur is during thread shutdown, which may be initiated by lower activity. In most cases, this is quite unlikely to happen. However, if it does, data structures may be corrupted which could lead to fatal failure and segfault. I detected this via a testbench test, not a user report. But I assume that some users may have had unreproducable aborts that were cause by this bug. |