summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v5-devel'Rainer Gerhards2011-04-265-34/+54
|\ | | | | | | | | Conflicts: tools/omfile.c
| * bugfix: pipes not opened in full priv mode when privs are to be droppedRainer Gerhards2011-04-262-5/+14
| |
| * bugfix: do not open files with full privileges, if privs will be droppedRainer Gerhards2011-04-263-37/+25
| | | | | | | | | | | | | | | | This make the privilege drop code more bulletproof, but breaks Ubuntu's work-around for log files created by external programs with the wrong user and/or group. Note that it was long said that this "functionality" would break once we go for serious privilege drop code, so hopefully nobody still depends on it (and, if so, they lost...).
| * updates ChangeLog with imported systemd support enhancementRainer Gerhards2011-04-191-0/+1
| |
| * Merge branch 'v5-devel-systemd-pri' into v5-develRainer Gerhards2011-04-191-4/+20
| |\
| | * experimental: support for systemd-induced second PRI in klogRainer Gerhards2011-03-181-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if systemd writes a kernel log entry with a non-kernel priority, the priority recorded in the kernel log will be wrong. However, it will be immediately followed by another priority (with the kernel timestamp in between, if enabled). So imklog now tries to see if there is a second PRI and, if so, uses it. Note that we already support non-kernel PRIs in the kernel log, as this was done in BSD for quite some while. HOWEVER the config statement "$klogpermitnonkernelfacility on" must be used to permit this (otherwise non kernel messages are dropped). Sample of a such a message on a kernel without timestamping enabled: $ echo '<14>text' > /dev/kmsg $ dmesg -r <4><14>text NOTE: support for timestamp is NOT YET ENABLED!
* | | step: outchannel list integrated into main config objectRainer Gerhards2011-04-265-52/+39
| | |
* | | step: moved config validation codeRainer Gerhards2011-04-262-29/+33
| | |
* | | shuffled even more config code from syslgod to config handlerRainer Gerhards2011-04-263-169/+116
| | |
* | | step: config handler setting from syslogd.c moved to rsconf.cRainer Gerhards2011-04-2112-371/+484
| | |
* | | step: begun to create a "load" interface in rsconfRainer Gerhards2011-04-213-21/+160
| | |
* | | step: slowly migrating config settings... ;)Rainer Gerhards2011-04-196-58/+110
| | |
* | | some more work was required on the ruleset modificationRainer Gerhards2011-04-196-30/+41
| | |
* | | milestone: ruleset now supports rsconf_tRainer Gerhards2011-04-1914-80/+100
| | |
* | | milestone: conf obj interface now utilzes rsconf_tRainer Gerhards2011-04-198-50/+92
| | |
* | | milestone: templates are now in config objectRainer Gerhards2011-04-1912-46/+244
| | |
* | | renaming conf.* wasn't a good idea -- undoingRainer Gerhards2011-04-1942-45/+45
| | | | | | | | | | | | | | | too many dependencies, things get cluttered (and merging probably gets problematic). Now new config will be "conf2".
* | | renamed conf.c to legacyconf.c to make room for new config systemRainer Gerhards2011-04-1942-45/+45
| | |
* | | bug: configure needs a check for more recent liblognormRainer Gerhards2011-04-181-1/+1
| | |
* | | preparing for 6.1.7v6.1.7Rainer Gerhards2011-04-153-3/+4
| | |
* | | Merge branch 'v5-devel'Rainer Gerhards2011-04-159-15/+70
|\| | | | | | | | | | | | | | Conflicts: plugins/impstats/impstats.c
| * | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-04-159-15/+67
| |\ \ | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | added imported bugfix to changelogRainer Gerhards2011-04-151-0/+3
| | | |
| | * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-04-153-2/+16
| | |\ \
| | | * | bugfix: IPv6-address could not be specified in omrelpRainer Gerhards2011-04-143-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | this was due to improper parsing of ":" closes: http://bugzilla.adiscon.com/show_bug.cgi?id=250
| | * | | sm_cust_bindcdr: updated field mapping according to spec received todayRainer Gerhards2011-04-151-3/+11
| | | | |
| | * | | bugfix: doc for impstats had wrong config statementsRainer Gerhards2011-04-143-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also, config statements were named a bit inconsistent, resolved that problem by introducing an alias and only documenting the consistent statements Thanks to Marcin for bringing up this problem.
| | * | | bugfix: $myhostname not available in RainerScript (and no error message)Rainer Gerhards2011-04-144-5/+25
| | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=233
* | | | | bugfix (kind of): memory leak with tcp reception epoll handlerRainer Gerhards2011-04-132-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | This was an extremely unlikely leak and, if it happend, quite small. Still it is better to handle this border case.
* | | | | bugfix: enhanced imudp config processing code disabled due to wrong mergeRainer Gerhards2011-04-132-2/+4
| | | | | | | | | | | | | | | | | | | | (affected UDP realtime capabilities)
* | | | | added log classification capabilities (via mmnormalize & tags)Rainer Gerhards2011-04-134-20/+18
| | | | |
* | | | | Merge branch 'v5-devel'Rainer Gerhards2011-04-1212-140/+178
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html plugins/imtcp/imtcp.c
| * | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-04-128-139/+143
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | cosmetic nit - final prep for 5.8.0v5.8.0Rainer Gerhards2011-04-121-0/+1
| | | | |
| | * | | testbench sent a big bunch of error messages to console - supporessedRainer Gerhards2011-04-121-0/+5
| | | | |
| | * | | Merge branch 'v5-beta' into v5-stableRainer Gerhards2011-04-12181-543/+7325
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | plus bump to new v5-stable Conflicts: ChangeLog configure.ac doc/manual.html
| | | * | | cleanup: initially thought temporary debug message made durable ;)Rainer Gerhards2011-04-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It has proven to be very valuable, so now it is properly formatted inside the source.
| | | * | | confirmed that the race condition fix solved bug #238Rainer Gerhards2011-04-121-0/+3
| | | | | |
| | | * | | corrected ActionSendResendLastMsgOnReconnect docsMarius Tomaschewski2011-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Marius Tomaschewski <mt@suse.de>
| | | * | | bugfix: race condition in deferred name resolutionRainer Gerhards2011-04-082-115/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that this actually is a very small change, but I needed to shuffle a lot of code around in order to make it compile (due to required define order...).
| | | * | | doc bugfix: doc listed no-longer existing TLS limitationsRainer Gerhards2011-04-011-16/+2
| | | | | |
| | * | | | preparing for 5.6.5v5.6.5Rainer Gerhards2011-03-223-3/+3
| | | | | |
| * | | | | added new config directive $InputTCPFlowControl...Rainer Gerhards2011-04-016-3/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... to select if tcp received messages shall be flagged as light delayable or not.
* | | | | | doc on using liblognorm-created properties was massingRainer Gerhards2011-04-111-0/+8
| | | | | |
* | | | | | omfwd: made send function handling incomplete sends correctlyRainer Gerhards2011-04-041-12/+7
| | | | | |
* | | | | | added one more testcase for sending TCP/TLS syslogRainer Gerhards2011-04-046-2/+58
| | | | | |
* | | | | | omfwd: speeded up tcp forwarding by reducing number of API callsRainer Gerhards2011-04-043-12/+68
| | | | | |
* | | | | | activated TLS send/receive test in testbenchRainer Gerhards2011-04-042-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was possible because in v6 we do no longer have the TLS startup delay.
* | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-03-3140-78/+999
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html doc/rsyslog_conf.html runtime/msg.c runtime/rsyslog.h template.c
| * | | | | Merge branch 'v5-beta' into v5-develRainer Gerhards2011-03-3126-33/+685
| |\ \ \ \ \ | | | |/ / / | | |/| | / | | |_|_|/ | |/| | | Conflicts: ChangeLog