summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-112-2/+6
|\ | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * fixed typo in changelogAndre Lorbach2011-08-101-1/+1
| |
| * added changelog entryAndre Lorbach2011-08-101-0/+3
| |
| * Fixed BUG in MsgDup (msg.c), the NULL Byte was not copied for the SyslogTagAndre Lorbach2011-08-101-1/+1
| | | | | | | | | | The syslogtag of the duplicated message could get contain garbage at the end as the string terminating NULL Byte was missing.
| * preparing for version 5.8.4v5.8.4root2011-08-103-3/+3
| |
* | Merge branch 'v5-devel' of git+ssh://al@git.adiscon.com/git/rsyslog into ↵Andre Lorbach2011-08-105-6/+35
|\ \ | | | | | | | | | v5-devel
| * \ Merge branch 'v5-stable' into v5-develRainer Gerhards2011-08-092-1/+7
| |\ \
| * | | added capability to emit config error location info for warningsRainer Gerhards2011-08-095-6/+35
| | | | | | | | | | | | | | | | | | | | otherwise, omusrmsg's warning about new config format was not accompanied by problem location.
* | | | Added changelog entry for bugid 275Andre Lorbach2011-08-101-0/+2
| | | |
* | | | Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-103-4/+20
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Added changelog entry for bugid 275Andre Lorbach2011-08-101-0/+3
| | |
| * | Merge branch 'v5-stable-msgidfix' into v5-stableAndre Lorbach2011-08-101-3/+10
| |\ \ | | |/ | |/|
| | * Cosmetic changeAndre Lorbach2011-07-271-2/+2
| | |
| | * Fixed a stupid return bug introduced by the last commitAndre Lorbach2011-07-271-1/+2
| | |
| | * Experimentally added mutex lock in getMSGID in order to fix bug 275.Andre Lorbach2011-07-261-3/+9
| | |
| * | cosmetic: add imported bugfix to ChangeLogRainer Gerhards2011-08-091-0/+3
| | |
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-08-092-1/+4
| |\ \
| | * | bugfix: memcpy overflow can occur in allowed sender checkingMarius Tomaschewski2011-08-092-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ...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-develAndre Lorbach2011-08-054-15/+29
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | Merge branch 'v4-stable' into v5-stableAndre Lorbach2011-08-051-0/+4
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | Merge branch 'v3-stable' into v4-stableAndre Lorbach2011-08-052-7/+11
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/msg.c
| | | * | bugfix: potential misadressing in property replacerAndre Lorbach2011-08-052-7/+8
| | | | |
| * | | | Added changelog entryAndre Lorbach2011-08-051-0/+3
| | | | |
| * | | | bugfix: potential misadressing in property replacerAndre Lorbach2011-08-051-7/+9
| | |_|/ | |/| |
| * | | doc: cleanup of copy-and-paste error in commentRainer Gerhards2011-07-131-1/+1
| | | | | | | | | | | | | | | | thanks to darix for alerting me
| * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-07-111-7/+9
| |\| |
| | * | doc: updated rsyslog.conf man page with new syntaxesRainer Gerhards2011-07-111-7/+9
| | | |
* | | | preparing for 5.9.2v5.9.2Rainer Gerhards2011-07-112-2/+2
| | | |
* | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-07-116-7/+48
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h
| * | | preparing for 5.8.3v5.8.3Rainer Gerhards2011-07-113-3/+6
| | | |
| * | | added warning message for old-style outchannel syntaxRainer Gerhards2011-07-113-1/+28
| | | |
| * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-07-115-6/+16
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/diag.sh
| | * | preparing for 4.6.7 releasev4.6.7Rainer Gerhards2011-07-118-15/+16
| | | |
| | * | support for :omfile: forward compatibility directiveRainer Gerhards2011-07-113-3/+11
| | | |
* | | | issue a warning if old omusrmsg action syntax is usedRainer Gerhards2011-07-062-2/+11
| | | |
* | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-07-066-11/+30
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/manual.html
| * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-07-065-11/+23
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | added support for the ":omusrmsg:" syntax in configuring user messagesRainer Gerhards2011-07-063-8/+19
| | | |
| | * | doc: ./configure --help invalidly showed imdiag enabled by defaultRainer Gerhards2011-07-061-1/+1
| | | | | | | | | | | | | | | | Thanks to Frédéric L. W. Meunier for bringing this to my attention.
| | * | preparing for 4.6.6v4.6.6Rainer Gerhards2011-06-243-3/+3
| | | |
| * | | doc: mentioned Lennart's patch in ChangeLogRainer Gerhards2011-07-021-0/+3
| | | |
| * | | systemd: direct stdout/stderr of rsyslog to nullLennart Poettering2011-07-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows systemd upstream to set stdout/stderr of all spawned services by default to 'syslog'. In order to avoid log loops rsyslog itself must be have its stdout/stderr connected to 'null' in that case, however.
| * | | reduced sporadic failures during make checkRainer Gerhards2011-06-301-9/+14
| | | | | | | | | | | | | | | | backport from v6
* | | | preparing for 5.9.1 releasev5.9.1Rainer Gerhards2011-06-304-6/+3
| | | |
* | | | cosmetic: reformatted some codeRainer Gerhards2011-06-301-12/+5
| | | | | | | | | | | | | | | | so that more fits on a single screen --> useful for analysis
* | | | backported patch for testbench race reductionRainer Gerhards2011-06-301-9/+14
| | | |
* | | | added support for obtaining timestamp for kernel message from messageRainer Gerhards2011-06-246-99/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-develRainer Gerhards2011-06-2114-69/+177
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | bugfix: mutex was invalidly left unlocked during action processingv5.8.2Rainer Gerhards2011-06-213-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | preparing for 5.8.2Rainer Gerhards2011-06-214-4/+5
| | | |