Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'beta' | Andre Lorbach | 2011-08-18 | 6 | -8/+46 |
|\ | | | | | | | | | Conflicts: runtime/queue.c | ||||
| * | Merge branch 'v5-stable' into beta | Andre Lorbach | 2011-08-18 | 6 | -7/+47 |
| |\ | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac | ||||
| | * | removed debug code from action.c and runtime/queue.c after testing | Andre Lorbach | 2011-08-18 | 2 | -21/+0 |
| | | | |||||
| | * | bugfix: fixed incorrect state handling for Discard Action (transactions) | Andre Lorbach | 2011-08-18 | 4 | -3/+49 |
| | | | |||||
| | * | Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stable | Andre Lorbach | 2011-08-12 | 1 | -2/+2 |
| | |\ | |||||
| | | * | minor doc: made body tag parsable for web site scripts | Rainer Gerhards | 2011-08-12 | 1 | -2/+2 |
| | | | | |||||
| | * | | Added debug output into message parsers needed for bugtracking | Andre Lorbach | 2011-08-12 | 3 | -1/+8 |
| | |/ | | | | | | | | | | Changed version to 5.8.5-pre1 | ||||
| | * | bugfixes for tag emulation | Rainer Gerhards | 2011-08-11 | 2 | -3/+8 |
| | | | | | | | | | | | | | | | - bugfix: potential hang condition during tag emulation - bugfix: too-early string termination during tag emulation | ||||
* | | | Merge branch 'beta' | Andre Lorbach | 2011-08-11 | 2 | -2/+6 |
|\| | | |||||
| * | | Merge branch 'v5-stable' into beta | Andre Lorbach | 2011-08-11 | 2 | -2/+6 |
| |\| | | | | | | | | | | | | | | | | | | | 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 |
| | | | |||||
| | * | Fixed BUG in MsgDup (msg.c), the NULL Byte was not copied for the SyslogTag | Andre Lorbach | 2011-08-10 | 1 | -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.4 | root | 2011-08-10 | 3 | -3/+3 |
| | | | |||||
| * | | Merge branch 'v5-stable' into beta | Andre Lorbach | 2011-08-10 | 2 | -3/+13 |
| |\| | |||||
* | | | Merge branch 'v5-stable' | Andre Lorbach | 2011-08-10 | 2 | -3/+13 |
|\ \ \ | | |/ | |/| | |||||
| * | | Added changelog entry for bugid 275 | Andre Lorbach | 2011-08-10 | 1 | -0/+3 |
| | | | |||||
| * | | Merge branch 'v5-stable-msgidfix' into v5-stable | Andre Lorbach | 2011-08-10 | 1 | -3/+10 |
| |\ \ | |||||
| | * | | Cosmetic change | Andre Lorbach | 2011-07-27 | 1 | -2/+2 |
| | | | | |||||
| | * | | Fixed a stupid return bug introduced by the last commit | Andre Lorbach | 2011-07-27 | 1 | -1/+2 |
| | | | | |||||
| | * | | Experimentally added mutex lock in getMSGID in order to fix bug 275. | Andre Lorbach | 2011-07-26 | 1 | -3/+9 |
| | | | | |||||
* | | | | Merge branch 'beta' | Rainer Gerhards | 2011-08-09 | 2 | -1/+10 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | minor: added imported bug to ChangeLog | Rainer Gerhards | 2011-08-09 | 1 | -0/+3 |
| | | | | |||||
| * | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-08-09 | 2 | -1/+7 |
| |\| | | |||||
| | * | | 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 | 2 | -1/+4 |
| | |\ \ | |||||
| | | * | | bugfix: memcpy overflow can occur in allowed sender checking | Marius Tomaschewski | 2011-08-09 | 2 | -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 Gerhards | 2011-08-05 | 1 | -2/+4 |
| | | | | | |||||
* | | | | | mostly cosmetic: error message did incorrectly contain errno-info | Rainer Gerhards | 2011-08-05 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | - imudp&imtcp now report error if no listener at all was defined | Rainer Gerhards | 2011-08-05 | 4 | -1/+14 |
| | | | | | | | | | | | | | | | | | | | | Thanks to Marcin for suggesting this error message | ||||
* | | | | | Merge branch 'beta' | Andre Lorbach | 2011-08-05 | 2 | -9/+25 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h | ||||
| * | | | | Merge branch 'v5-stable' into beta | Andre Lorbach | 2011-08-05 | 3 | -8/+20 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -7/+11 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/msg.c | ||||
| | | | * | | bugfix: potential misadressing in property replacer | Andre Lorbach | 2011-08-05 | 2 | -7/+8 |
| | | | | | | |||||
| | * | | | | Added changelog entry | Andre Lorbach | 2011-08-05 | 1 | -0/+3 |
| | | | | | | |||||
| | * | | | | bugfix: potential misadressing in property replacer | Andre Lorbach | 2011-08-05 | 1 | -7/+9 |
| | | |_|/ | | |/| | | |||||
| * | | | | Merge branch 'v4-stable' into beta | Rainer Gerhards | 2011-07-11 | 1 | -7/+9 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | preparing for 6.1.11v6.1.11 | Rainer Gerhards | 2011-07-11 | 3 | -3/+3 |
| | | | | | |||||
| * | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-07-11 | 7 | -12/+48 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h | ||||
* | | | | | | preparing for 6.3.4 releasev6.3.4 | Rainer Gerhards | 2011-08-02 | 3 | -3/+3 |
| | | | | | | |||||
* | | | | | | added new functionality to ChangeLog | Rainer Gerhards | 2011-08-02 | 1 | -0/+4 |
| | | | | | | |||||
* | | | | | | milestone: queue-params are properly initialized for action queues | Rainer Gerhards | 2011-08-01 | 4 | -14/+54 |
| | | | | | | |||||
* | | | | | | regression: omfile aborted on dynafiles (never released bug) | Rainer Gerhards | 2011-08-01 | 1 | -4/+3 |
| | | | | | | |||||
* | | | | | | milestone: generic action parameters parsed via new config system | Rainer Gerhards | 2011-08-01 | 4 | -30/+91 |
| | | | | | | |||||
* | | | | | | milestone: queue object now has a param handler for new conf interface | Rainer Gerhards | 2011-07-22 | 11 | -99/+267 |
| | | | | | | | | | | | | | | | | | | | | | | | | ... and action queue defs use this new interface (but not yet the main queues) | ||||
* | | | | | | need to handle legacy-legacy omusrmsg format stricter | Rainer Gerhards | 2011-07-22 | 2 | -3/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | otherwise, the grammar for if-constructs was broken | ||||
* | | | | | | milestone: all syntaxes for new config handler implemented | Rainer Gerhards | 2011-07-22 | 5 | -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 curiosity | Rainer Gerhards | 2011-07-22 | 1 | -1/+4 |
| | | | | | | |||||
* | | | | | | build system cleanup/improvement | Rainer Gerhards | 2011-07-22 | 2 | -7/+2 |
| | | | | | |