Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'beta' | Andre Lorbach | 2011-08-18 | 2 | -3/+18 |
|\ | | | | | | | | | Conflicts: runtime/queue.c | ||||
| * | Merge branch 'v5-stable' into beta | Andre Lorbach | 2011-08-18 | 2 | -2/+19 |
| |\ | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac | ||||
| | * | removed debug code from action.c and runtime/queue.c after testing | Andre Lorbach | 2011-08-18 | 1 | -4/+0 |
| | | | |||||
| | * | bugfix: fixed incorrect state handling for Discard Action (transactions) | Andre Lorbach | 2011-08-18 | 1 | -0/+13 |
| | | | |||||
| | * | Added debug output into message parsers needed for bugtracking | Andre Lorbach | 2011-08-12 | 1 | -0/+5 |
| | | | | | | | | | | | | Changed version to 5.8.5-pre1 | ||||
| | * | bugfixes for tag emulation | Rainer Gerhards | 2011-08-11 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | - bugfix: potential hang condition during tag emulation - bugfix: too-early string termination during tag emulation | ||||
* | | | Merge branch 'beta' | Andre Lorbach | 2011-08-11 | 1 | -1/+1 |
|\| | | |||||
| * | | Merge branch 'v5-stable' into beta | Andre Lorbach | 2011-08-11 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | 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. | ||||
| * | | Merge branch 'v5-stable' into beta | Andre Lorbach | 2011-08-10 | 1 | -3/+10 |
| |\| | |||||
* | | | Merge branch 'v5-stable' | Andre Lorbach | 2011-08-10 | 1 | -3/+10 |
|\ \ \ | | |/ | |/| | |||||
| * | | 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 | 1 | -1/+1 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-08-09 | 1 | -1/+1 |
| |\| | | |||||
| | * | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-08-09 | 1 | -1/+1 |
| | |\ \ | |||||
| | | * | | bugfix: memcpy overflow can occur in allowed sender checking | Marius Tomaschewski | 2011-08-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...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 'v3-stable' into v4-stable | Andre Lorbach | 2011-08-05 | 1 | -7/+7 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/msg.c | ||||
| | | | * | | bugfix: potential misadressing in property replacer | Andre Lorbach | 2011-08-05 | 1 | -7/+7 |
| | | | | | | |||||
* | | | | | | - imudp&imtcp now report error if no listener at all was defined | Rainer Gerhards | 2011-08-05 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Marcin for suggesting this error message | ||||
* | | | | | | Merge branch 'beta' | Andre Lorbach | 2011-08-05 | 1 | -7/+9 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h | ||||
| * | | | | | Merge branch 'v5-stable' into beta | Andre Lorbach | 2011-08-05 | 1 | -7/+9 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | | | | bugfix: potential misadressing in property replacer | Andre Lorbach | 2011-08-05 | 1 | -7/+9 |
| | | |_|/ | | |/| | | |||||
| | * | | | added warning message for old-style outchannel syntax | Rainer Gerhards | 2011-07-11 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | milestone: queue-params are properly initialized for action queues | Rainer Gerhards | 2011-08-01 | 2 | -0/+35 |
| | | | | | |||||
* | | | | | milestone: generic action parameters parsed via new config system | Rainer Gerhards | 2011-08-01 | 2 | -2/+3 |
| | | | | | |||||
* | | | | | milestone: queue object now has a param handler for new conf interface | Rainer Gerhards | 2011-07-22 | 5 | -41/+178 |
| | | | | | | | | | | | | | | | | | | | | ... and action queue defs use this new interface (but not yet the main queues) | ||||
* | | | | | milestone: all syntaxes for new config handler implemented | Rainer Gerhards | 2011-07-22 | 3 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so far, mostly compile-time tested. Real testing happens as side-activity when implementing other parts of the new config system | ||||
* | | | | | bugfix: abort in omfile (in brand-new code) | Rainer Gerhards | 2011-07-21 | 2 | -3/+8 |
| | | | | | |||||
* | | | | | milestone: omfile basically gets its parameters via the new system | Rainer Gerhards | 2011-07-21 | 2 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | but not all syntax handlers are present (so it does not yet fully work). | ||||
* | | | | | fixing minor memory leaks | Rainer Gerhards | 2011-07-21 | 2 | -7/+7 |
| | | | | | |||||
* | | | | | milestone: new output plugin interface call added | Rainer Gerhards | 2011-07-21 | 6 | -22/+56 |
| | | | | | |||||
* | | | | | milestone: done plumbing to call plugin create action instance entry point | Rainer Gerhards | 2011-07-20 | 5 | -43/+30 |
| | | | | | |||||
* | | | | | milestone: on the way to a new action conf interface to plugins... | Rainer Gerhards | 2011-07-20 | 2 | -9/+70 |
| | | | | | |||||
* | | | | | milestone: added module config names | Rainer Gerhards | 2011-07-20 | 5 | -84/+27 |
| | | | | | |||||
* | | | | | milestone: size syntax implemented | Rainer Gerhards | 2011-07-19 | 2 | -10/+7 |
| | | | | | |||||
* | | | | | milestone: glbl obj parameters settable via new conf interface | Rainer Gerhards | 2011-07-19 | 3 | -3/+74 |
| | | | | | |||||
* | | | | | milestone: two syntaxes for get conf param implemented | Rainer Gerhards | 2011-07-19 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | milestone: first steps at global() conf obj implementation | Rainer Gerhards | 2011-07-19 | 3 | -2/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | also, the foundation for accessing conf file params has been laid. Still more work to do... | ||||
* | | | | | bugfix: misaddressing in config handler | Rainer Gerhards | 2011-07-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | In theory, can cause segfault, in practice this is extremely unlikely Thanks to Marcin for alertig me. | ||||
* | | | | | more cleanup | Rainer Gerhards | 2011-07-15 | 3 | -9/+12 |
| | | | | | |||||
* | | | | | some more cleanup | Rainer Gerhards | 2011-07-15 | 4 | -382/+2 |
| | | | | | | | | | | | | | | | | | | | | preparing for a new, higher performance, variant object type | ||||
* | | | | | Merge branch 'master-newconf' | Rainer Gerhards | 2011-07-12 | 29 | -4233/+359 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tools/omfile.c | ||||
| * | | | | | removed emergency config, do error reporting on fatal config file error | Rainer Gerhards | 2011-07-12 | 2 | -85/+17 |
| | | | | | | |||||
| * | | | | | more cleanup, working on emergency config system | Rainer Gerhards | 2011-07-11 | 3 | -16/+59 |
| | | | | | | |||||
| * | | | | | fixed lexer: facilities local0-local7 were not correctly handled | Rainer Gerhards | 2011-07-11 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | even more cleanup ;) | Rainer Gerhards | 2011-07-11 | 2 | -105/+0 |
| | | | | | | |||||
| * | | | | | more cleanup... | Rainer Gerhards | 2011-07-11 | 7 | -259/+0 |
| | | | | | |