summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master-solaris'Rainer Gerhards2010-03-232-1/+9
|\
| * Merge branch 'master' into master-solarisRainer Gerhards2010-03-094-8/+28
| |\ | | | | | | | | | | | | Conflicts: ChangeLog
| * \ Merge branch 'master' into master-solarisRainer Gerhards2010-03-051-0/+16
| |\ \
| * | | bugfix: omfile.c did not properly compile without atomicsRainer Gerhards2010-03-051-1/+6
| | | | | | | | | | | | | | | | | | | | while this worked on another platform, it did not work here, and failed to do so for good reasons ;)
| * | | Merge branch 'v4-stable-solaris' into master-solarisRainer Gerhards2010-03-0513-34/+66
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/rt-init.c
| | * | | enabled compilation by using "racy" replacements for atomic instructionsRainer Gerhards2010-03-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... but this is not considered a real solution. For some of the uses, it may acutally be sufficient, but the implications need to be analyzed in detail.
| | * | | Merge branch 'v4-stable' into v4-stable-solarisRainer Gerhards2010-03-0513-38/+66
| | |\ \ \
| * | \ \ \ Merge branch 'master' into master-solarisRainer Gerhards2010-03-0513-12/+84
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'solaris' into master-solarisRainer Gerhards2010-03-050-0/+0
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into solarisRainer Gerhards2009-05-25103-542/+2885
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'nextmaster' into solarisRainer Gerhards2009-04-0919-175/+543
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'nextmaster' into solarisRainer Gerhards2009-04-094-2/+17
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | adding missing Solaris linker options (network libs)Rainer Gerhards2009-04-091-1/+3
| | | | | | | | | | |
* | | | | | | | | | | emulate missing atomic builtins with posix semaphores if availableSteffen Sledz2010-03-235-1/+205
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Steffen Sledz <sledz@dresearch.de> Acked-by: Thilo Fromm <t.fromm@dresearch.de>
* | | | | | | | | | Merge branch 'v5-stable'Rainer Gerhards2010-03-0914-37/+86
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html doc/property_replacer.html runtime/datetime.h
| * \ \ \ \ \ \ \ \ \ Merge branch 'v4-stable' into v5-stableRainer Gerhards2010-03-0911-8/+64
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/datetime.h
| | * | | | | | | | | | added new property replacer option "date-rfc3164-buggyday"Rainer Gerhards2010-03-0812-8/+74
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | primarily to ease migration from syslog-ng. See property replacer doc for details. [backport from 5.5.3 because urgently needed by some]
| * | | | | | | | | | preparing for 5.4.0v5.4.0Rainer Gerhards2010-03-083-3/+9
| | | | | | | | | | |
| * | | | | | | | | | added forgotten fileRainer Gerhards2010-03-081-0/+16
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'v4-stable' into betaRainer Gerhards2010-03-0812-34/+64
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/rt-init.c
| | * | | | | | | | | prepared 4.6.1v4.6.1Rainer Gerhards2010-03-043-3/+3
| | | | | | | | | | |
| | * | | | | | | | | streamlined BSD utmpx.h patchCristiano2010-03-041-14/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | * | | | | | | | | cosmetic: ChangeLog updateRainer Gerhards2010-03-041-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | including proper credits to Mandriva team.
| | * | | | | | | | | Fix Large File Support (LFS) support (bug #182)Yann Droneaud2010-03-043-23/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - _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-046-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For consistency, ./configure generated "config.h" must be the first header include through out the project. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | * | | | | | | | | reordered some include, because otherwise we get zlib-related errorsRainer Gerhards2010-03-031-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on some platforms (namely Debian sid). This smells like a bug in zlib. Thanks to Michael Biebl for reporting the issue.
| | * | | | | | | | | bugfix: potential (but very impropable) segfaults in omfileRainer Gerhards2010-03-022-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
* | | | | | | | | | | updated project statusRainer Gerhards2010-03-081-5/+5
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | added file so far forgotten in gitRainer Gerhards2010-03-051-0/+16
| |_|_|_|_|_|_|/ / |/| | | | | | | |
* | | | | | | | | relaxed need for atomic builtinsRainer Gerhards2010-03-051-0/+27
| | | | | | | | |
* | | | | | | | | updated project statusRainer Gerhards2010-03-051-4/+4
| | | | | | | | |
* | | | | | | | | added new property replacer option "date-rfc3164-buggyday"Rainer Gerhards2010-03-0511-8/+53
| |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | primarily to ease migration from syslog-ng. See property replacer doc for details.
* | | | | | | | bugfix: failed to compile on systems without epoll supportRainer Gerhards2010-03-024-9/+12
| | | | | | | |
* | | | | | | | Merge branch 'v4-stable-solaris' into master-solarisRainer Gerhards2010-03-021-0/+1
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | added include needed for SolarisRainer Gerhards2010-03-021-0/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'beta' into masterRainer Gerhards2010-03-0112-28/+360
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tools/syslogd.c
| * | | | | | cosmetic: added bugentry to changelogRainer Gerhards2010-03-011-0/+4
| | | | | | |
| * | | | | | Merge branch 'v4-stable' into tmpRainer Gerhards2010-03-0112-28/+351
| |\| | | | |
| | * | | | | cosmetic: bugfix in ChangeLog highlightedRainer Gerhards2010-03-011-0/+4
| | | | | | |
| | * | | | | Merge branch 'v3-stable' into v4-stableRainer Gerhards2010-03-012-7/+33
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/ctok.c
| | | * | | | | bugfix: comment char ('#') in literal terminated script parsingRainer Gerhards2010-03-012-7/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...and thus could not be used. but tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=119
| | * | | | | | cleanup: removed debug messages that accidently made it into the commitRainer Gerhards2010-03-012-2/+1
| | | | | | | |
| | * | | | | | 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-014-15/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-283-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | fully integrated parser fixes from v4.6.0Rainer Gerhards2010-02-252-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also made necessary a parser test case updates. Acutally, the test case was wrong, but I did not notice that before.