summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v4-stable' into betaRainer Gerhards2010-03-086-10/+36
|\ | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/rt-init.c
| * streamlined BSD utmpx.h patchCristiano2010-03-041-14/+12
| | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * Fix Large File Support (LFS) support (bug #182)Yann Droneaud2010-03-041-1/+1
| | | | | | | | | | | | | | | | | | - _FILE_OFFSET_BITS must be defined before including any other system headers otherwise it does nothing. - Don't define it in rsyslog.h, let it be defined in config.h, and let ./configure script enable LFS since Autoconf provides a portable macro to enable LFS support : AC_SYS_LARGEFILE
| * Includes "config.h" before any other header.Yann Droneaud2010-03-043-0/+3
| | | | | | | | | | | | | | For consistency, ./configure generated "config.h" must be the first header include through out the project. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * bugfix: potential (but very impropable) segfaults in omfileRainer Gerhards2010-03-021-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | - bugfix: potential segfault in omfile when a dynafile open failed In that case, a partial cache entry was written, and some internal pointers (iCurrElt) not correctly updated. In the next iteration, that could lead to a segfault, especially if iCurrElt then points to the then-partial record. Not very likely, but could happen in practice. - bugfix (theoretical): potential segfault in omfile under low memory condition. This is only a theoretical bug, because it would only happen when strdup() fails to allocate memory - which is highly unlikely and will probably lead to all other sorts of errors.
| * solved compile problems on FreeBSD 9.0 (those caused by utmpx.h)Cristiano2010-03-021-7/+20
| | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | Merge branch 'v4-stable' into tmpRainer Gerhards2010-03-018-20/+306
|\|
| * fixed typo that (could have) caused compilation fail under FreeBSDRainer Gerhards2010-03-011-3/+3
| | | | | | | | | | Note that I now also prefer to use utmp.h if it is present - this seems to be much better under Linux.
| * make $ActonFileDefaultTemplate available to ompipeRainer Gerhards2010-03-013-15/+17
| | | | | | | | | | | | | | | | | | This was not honored by the new ompipe module, because it is a local file directive (it was applied to pipes as a side-effect of using the same module for pipes and files...). I now made this a global, so that semantics are the same as previously. Not really nice, but probably the best thing to do in the current situation (everything else would involve much more overhead --- leave that for the new config system).
| * bugfix: fixed problem that caused compilation on FreeBSD 9.0 to fail.Rainer Gerhards2010-02-281-1/+5
| | | | | | | | | | bugtracker: http://bugzilla.adiscon.com/show_bug.cgi?id=181 Thanks to Christiano for reporting.
| * Description: Correct error in rsyslog.conf(5) man pageMichael Biebl2010-02-281-1/+1
| | | | | | | | | | | | | | $InputUDPServerRun config variable does not exist, should be $UDPServerRun instead http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=571202 Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * some code cleanupRainer Gerhards2010-02-284-15/+12
| |
| * moved pipe code to its own moduleRainer Gerhards2010-02-285-1/+284
| | | | | | | | | | | | | | ... based on old omfile. Michael Biebl reported that xconsole seems to have some issues with the new pipe code, so it was best to use the old code for pipes. The optimizations were done to speed up file access, so it doesn't really matter pipes do not receive them.
| * message parser fixes and testbench enhancementsRainer Gerhards2010-02-221-4/+12
| | | | | | | | | | | | | | | | | | - improved testbench to contain samples for totally malformed messages which miss parts of the message content - bugfix: some malformed messages could lead to a missing LF inside files or some other missing parts of the template content. - bugfix: if a message ended immediately with a hostname, the hostname was mistakenly interpreted as TAG, and localhost be used as hostname
| * bugfix: message without MSG part could case a segfaultRainer Gerhards2010-02-221-4/+2
| | | | | | | | | | | | | | [backported from v5 commit 98d1ed504ec001728955a5bcd7916f64cd85f39f] This actually was a "recent" regression, but I did not realize that it was introduced by the performance optimization in v4-devel. Shame on me for having two devel versions at the same time...
* | fully integrated parser fixes from v4.6.0Rainer Gerhards2010-02-251-4/+12
| | | | | | | | | | This also made necessary a parser test case updates. Acutally, the test case was wrong, but I did not notice that before.
* | Merge branch 'v4-beta' into betaRainer Gerhards2010-02-041-0/+3
|\|
| * Merge branch 'v4-stable' into v4-betaRainer Gerhards2010-02-041-0/+3
| |\
| | * bugfix: several smaller bugs resolved after flexelint reviewvarmojfekoj2010-02-041-0/+3
| | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | Merge branch 'v4-beta' into betaRainer Gerhards2010-02-031-1/+5
|\| |
| * | (slightly) enhanced support for FreeBSD by setting _PATH_MODDIR to the ↵Cristiano2010-02-031-1/+5
| | | | | | | | | | | | | | | | | | correct value on FreeBSD. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | backporting bugfixes from 5.2.2Rainer Gerhards2010-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - bugfix: queues in direct mode could case a segfault, especially if an action failed for action queues. The issue was an invalid increment of a stack-based pointer which lead to destruction of the stack frame and thus a segfault on function return. Thanks to Michael Biebl for alerting us on this problem. [backport from 5.5.2] - bugfix: wrong memory assignment for a config variable (probably without causing any harm) [backport from 5.2.2]
* | | Merge branch 'v4-beta' into betaRainer Gerhards2010-01-261-0/+1
|\| | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/queue.c
| * | bugfix: -d did not enable display of debug messagesRainer Gerhards2010-01-191-0/+1
| | | | | | | | | | | | | | | regression from introduction of "debug on demand" mode Thanks to Michael Biebl for reporting this bug
* | | Merge branch 'v4-beta' into betaRainer Gerhards2010-01-191-2/+2
|\| |
| * | Merge branch 'v4-stable' into v4-betaRainer Gerhards2010-01-191-2/+2
| |\|
| | * Fix a typo regarding syslog.h and syslog(3)Michael Biebl2010-01-191-2/+2
| | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | Merge branch 'v4-beta' into betaRainer Gerhards2010-01-151-6/+16
|\| | | | | | | | | | | | | | Conflicts: ChangeLog
| * | bugfix: rsyslog hangs when writing to a named pipe which nobody was reading.Rainer Gerhards2010-01-151-6/+16
| | | | | | | | | | | | Thanks to Michael Biebl for reporting this bug.
* | | Merge branch 'v4-beta' into betaRainer Gerhards2010-01-121-0/+6
|\| |
| * | fixed a memory leak when sending messages in zip-compressed formatNaoya Nakazawa2010-01-111-0/+6
| | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | worked around an issue where omfile failed to compile on 32 bit platformsRainer Gerhards2009-12-091-0/+4
| | | | | | | | | | | | | | | | | | ...under some circumstances (this smells like a gcc problem, but a simple solution was available). Thanks to Kenneth Marshall for some advice. [backported from 5.5.x branch]
* | | Merge branch 'v4-beta' into betaRainer Gerhards2009-12-041-0/+1
|\| |
| * | Merge branch 'v4-stable' into v4-betaRainer Gerhards2009-12-041-0/+1
| |\|
| | * Merge branch 'v3-stable' into v4-stableRainer Gerhards2009-12-041-0/+1
| | |\
| | | * bugfix: potential segfault when -p command line option was usedRainer Gerhards2009-12-041-0/+1
| | | | | | | | | | | | | | | | thanks to varmojfekoj for pointing me at this bug
| * | | Merge branch 'v4-stable' into v4-betaRainer Gerhards2009-11-301-1/+1
| |\| |
* | | | Merge branch 'v5-stable' into betaRainer Gerhards2009-11-301-1/+1
|\ \ \ \
| * \ \ \ Merge branch 'v4-stable' into v5-stableRainer Gerhards2009-11-302-3/+3
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | Conflicts: doc/rsyslog_conf_modules.html
| | * | | Merge branch 'v3-stable' into v4-stableRainer Gerhards2009-11-301-1/+1
| | |\ \ \ | | | | |/ | | | |/|
| | | * | bugfix: $CreateDirs variable not properly initializedRainer Gerhards2009-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | default thus was random (but most often "on")
| * | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2009-11-121-2/+2
| |\ \ \ \
* | \ \ \ \ Merge branch 'v4-beta' into betaRainer Gerhards2009-11-251-2/+2
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html doc/rsyslog_conf_modules.html tests/Makefile.am tests/sndrcv_drvr.sh
| * | | | | Merge branch 'v4-stable' into v4-betaRainer Gerhards2009-11-171-2/+2
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge branch 'v3-stable' into v4-stableRainer Gerhards2009-11-171-2/+2
| | |\ \ \ \ | | | |_|/ / | | |/| | / | | | | |/ | | | |/| | | | | | Conflicts: doc/rsyslog_conf.html runtime/net.c
| | | * | correcting -q/-Q patch - was invalidRainer Gerhards2009-11-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | This is the correct patch. The previous one solved the segfault, but disabled the -q/Q options.
* | | | | bugfix: omfile output was only written when buffer was fullRainer Gerhards2009-11-181-0/+2
| | | | | | | | | | | | | | | | | | | | ... not at end of transaction.
* | | | | some light performance enhancementRainer Gerhards2009-11-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | ...by replacing time() call with much faster (at least under linux) gettimeofday() calls.
* | | | | Merge branch 'v4-devel'Rainer Gerhards2009-11-121-2/+2
|\ \ \ \ \
| * | | | | Merge branch 'v4-beta' into v4-develRainer Gerhards2009-11-121-2/+2
| |\| | | |