summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'beta'Andre Lorbach2011-08-186-8/+46
|\ | | | | | | | | Conflicts: runtime/queue.c
| * Merge branch 'v5-stable' into betaAndre Lorbach2011-08-186-7/+47
| |\ | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| | * removed debug code from action.c and runtime/queue.c after testingAndre Lorbach2011-08-182-21/+0
| | |
| | * bugfix: fixed incorrect state handling for Discard Action (transactions)Andre Lorbach2011-08-184-3/+49
| | |
| | * Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stableAndre Lorbach2011-08-121-2/+2
| | |\
| | | * minor doc: made body tag parsable for web site scriptsRainer Gerhards2011-08-121-2/+2
| | | |
| | * | Added debug output into message parsers needed for bugtrackingAndre Lorbach2011-08-123-1/+8
| | |/ | | | | | | | | | Changed version to 5.8.5-pre1
| | * bugfixes for tag emulationRainer Gerhards2011-08-112-3/+8
| | | | | | | | | | | | | | | - bugfix: potential hang condition during tag emulation - bugfix: too-early string termination during tag emulation
* | | Merge branch 'beta'Andre Lorbach2011-08-112-2/+6
|\| |
| * | Merge branch 'v5-stable' into betaAndre 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-stable' into betaAndre Lorbach2011-08-102-3/+13
| |\|
* | | Merge branch 'v5-stable'Andre Lorbach2011-08-102-3/+13
|\ \ \ | | |/ | |/|
| * | 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
| | | |
* | | | Merge branch 'beta'Rainer Gerhards2011-08-092-1/+10
|\ \ \ \ | | |_|/ | |/| |
| * | | minor: added imported bug to ChangeLogRainer Gerhards2011-08-091-0/+3
| | | |
| * | | Merge branch 'v5-stable' into betaRainer Gerhards2011-08-092-1/+7
| |\| |
| | * | 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>
* | | | | somewhat more informative imklog status messages (mostly cosmetic)Rainer Gerhards2011-08-051-2/+4
| | | | |
* | | | | mostly cosmetic: error message did incorrectly contain errno-infoRainer Gerhards2011-08-051-1/+1
| | | | |
* | | | | - imudp&imtcp now report error if no listener at all was definedRainer Gerhards2011-08-054-1/+14
| | | | | | | | | | | | | | | | | | | | Thanks to Marcin for suggesting this error message
* | | | | Merge branch 'beta'Andre Lorbach2011-08-052-9/+25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h
| * | | | Merge branch 'v5-stable' into betaAndre Lorbach2011-08-053-8/+20
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | |_|/ | | |/| |
| * | | | Merge branch 'v4-stable' into betaRainer Gerhards2011-07-111-7/+9
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | preparing for 6.1.11v6.1.11Rainer Gerhards2011-07-113-3/+3
| | | | |
| * | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-07-117-12/+48
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h
* | | | | | preparing for 6.3.4 releasev6.3.4Rainer Gerhards2011-08-023-3/+3
| | | | | |
* | | | | | added new functionality to ChangeLogRainer Gerhards2011-08-021-0/+4
| | | | | |
* | | | | | milestone: queue-params are properly initialized for action queuesRainer Gerhards2011-08-014-14/+54
| | | | | |
* | | | | | regression: omfile aborted on dynafiles (never released bug)Rainer Gerhards2011-08-011-4/+3
| | | | | |
* | | | | | milestone: generic action parameters parsed via new config systemRainer Gerhards2011-08-014-30/+91
| | | | | |
* | | | | | milestone: queue object now has a param handler for new conf interfaceRainer Gerhards2011-07-2211-99/+267
| | | | | | | | | | | | | | | | | | | | | | | | ... and action queue defs use this new interface (but not yet the main queues)
* | | | | | need to handle legacy-legacy omusrmsg format stricterRainer Gerhards2011-07-222-3/+37
| | | | | | | | | | | | | | | | | | | | | | | | otherwise, the grammar for if-constructs was broken
* | | | | | milestone: all syntaxes for new config handler implementedRainer Gerhards2011-07-225-5/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so far, mostly compile-time tested. Real testing happens as side-activity when implementing other parts of the new config system
* | | | | | working around automake curiosityRainer Gerhards2011-07-221-1/+4
| | | | | |
* | | | | | build system cleanup/improvementRainer Gerhards2011-07-222-7/+2
| | | | | |