summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v3-stable' into betaRainer Gerhards2009-04-0210-11/+126
|\ | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * preparing for 3.20.5 releasev3.20.5Rainer Gerhards2009-04-024-4/+12
| |
| * Merge branch 'dapatch' into v3-stableRainer Gerhards2009-04-026-6/+102
| |\
| | * bugfix: potential abort with DA queue after high watermark is reachedRainer Gerhards2009-03-256-6/+102
| | | | | | | | | | | | | | | | | | There exists a race condition that can lead to a segfault. Thanks go to vbernetr, who performed the analysis and provided patch, which I only tweaked a very little bit.
| * | fixed bugs in RainerScriptvarmojfekoj2009-03-163-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | - when converting a number and a string to a common type, both were actually converted to the other variable's type. - the value of rsCStrConvertToNumber() was miscalculated. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | added link to online tutorial on the webRainer Gerhards2009-03-161-1/+5
| | |
| * | added link to (new) online video tutorials to manual setRainer Gerhards2009-03-111-0/+1
| | |
* | | Merge branch 'v3-stable' into betaRainer Gerhards2009-03-1110-14/+44
|\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | doc enhance: enhance ommysql documentationRainer Gerhards2009-03-062-1/+14
| | | | | | | | | | | | | | | provide standard template for MySQL module and instructions on how to modify schema
| * | doc typo fixRainer Gerhards2009-03-051-2/+2
| | | | | | | | | | | | thanks to Trent W. Buck for alerting me.
| * | fixed a potential segfault problem in gssapi codevarmojfekoj2009-03-022-1/+9
| | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | updated changelog to reflect patch appliedRainer Gerhards2009-02-241-0/+4
| | |
| * | Call PKG_PROG_PKG_CONFIG m4 macro unconditionally.Michael Biebl2009-02-241-0/+2
| | | | | | | | | | | | | | | | | | | | | As all the calls to PKG_CHECK_MODULES are conditional, it can happen that PKG_PROG_PKG_CONFIG is not called (i.e. if you not use --enable-relp). So we enforce a check for pkg-config by adding it to the global checks.
| * | doc fix: don't use absolute paths for $ModLoadMichael Biebl2009-02-242-3/+3
| | |
| * | changed TLS link on manual homepage to native TLS docRainer Gerhards2009-02-101-1/+1
| |/ | | | | | | | | | | | | ... pointed previously to stunnel-alternative, which now that we support native TLS is now no longer recommended. Thanks to Michael Biebl for bringing this to my attention.
| * preparing for 3.20.4v3.20.4Rainer Gerhards2009-02-092-2/+2
| |
| * doc bugfix: dist tarball missed 2 files, had one extra file that no longer ↵Rainer Gerhards2009-02-092-2/+5
| | | | | | | | | | | | belongs into it. Thanks to Michael Biebl for pointing this out.
| * bugfix: invalid ./configure settings for RFC3195Michael Biebl2009-02-062-2/+4
| | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * docfix: copy&paste errorRainer Gerhards2009-02-031-2/+2
| |
* | decreased GNUtls version requirementRainer Gerhards2009-02-241-1/+1
| | | | | | | | | | | | | | rsyslog also works with some 1.x.x versions, but I have not details any longer. I developed with a v1 version for a while. To be on the save side, I request 2.0.0 (Michael Biebl was even more conservative with 2.4.2 - which he had at hand - and so I am changing this now).
* | reflected build system changes in change logRainer Gerhards2009-02-241-0/+3
| |
* | Improve mysql configure check (for unusual paths)Michael Biebl2009-02-242-6/+1
| | | | | | | | | | | | | | | | | | | | | | Remove AC_CHECK_HEADERS([mysql/mysql.h],...) as this was causing pain for users where the mysql headers are not installed in the system include directory. It was superfluous anyways, as we check for mysql_config and set the include path to the correct directory. Update ommysql.c to use #include <mysql.h>, as mysql_config will set the include path to /path/to/include/mysql/ so <mysql/mysql.h> would not work. Remove errmsg.h include as it is not used.
* | Separate macro file for atomic operationsMichael Biebl2009-02-242-46/+54
| | | | | | | | | | | | To unclutter configure.ac and to make it easier re-usable, move the check for atomic operations into a separate m4 macro file and call the macro RS_ATOMIC_OPERATIONS (RS for RSyslog)
* | Split the m4 macros into a separate directoryMichael Biebl2009-02-243-0/+4
| |
* | Use pkg-config for GnuTLS configure checkMichael Biebl2009-02-241-22/+2
| | | | | | | | | | | | Use PKG_CHECK_MODULES instead of libgnutls-config to get the compilation flags (vastly simpler). Set minimum version to 2.4.2, as that is the oldest version I could test with.
* | Call PKG_PROG_PKG_CONFIG m4 macro unconditionally.Michael Biebl2009-02-241-0/+2
| | | | | | | | | | | | | | As all the calls to PKG_CHECK_MODULES are conditional, it can happen that PKG_PROG_PKG_CONFIG is not called (i.e. if you not use --enable-relp). So we enforce a check for pkg-config by adding it to the global checks.
* | make all cflags and libs variables uppercaseMichael Biebl2009-02-2424-80/+80
| | | | | | | | | | | | pkg-config uses uppercase for its _CFLAGS and _LIBS variable names. So we follow suit and convert all _cflags and _libs variables to uppercase for more consistency.
* | prepared for 3.21.10 releasev3.21.10Rainer Gerhards2009-02-023-3/+3
| |
* | added info if atomic ops are available to rsyslogd -v outputRainer Gerhards2009-01-302-0/+12
| |
* | Merge branch 'v3-stable' into beta, conclude fix for raceRainer Gerhards2009-01-304-3/+13
|\| | | | | | | | | | | Conflicts: ChangeLog runtime/msg.c
| * finished adding race condition fix (mostly done by merge)Rainer Gerhards2009-01-301-0/+3
| |
| * Merge branch 'debian_lenny' into v3-stableRainer Gerhards2009-01-301-12/+7
| |\
| | * fixed copy&paste errorRainer Gerhards2009-01-281-3/+3
| | | | | | | | | | | | | | | ... one should at least compile before comitting - sorry, been so eager to push that out.
| | * bugfix: proper message locking on message destructRainer Gerhards2009-01-271-12/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It looks like a race was introduced by not locking the message mutex in msgDestruct(). In theory, I thought, the decrement should be atomic, but the whole operation may be reordered. Also it has potential for task switches. If so, that would lead to a too-early destruction and thus a potential double free - exactly what we have seen from time to time. So I think this fix addresses the issue. I have also removed anything that looks like atomic operations are supported in this version - they are not. This was very late added, found to be non-portable and pulled from that release.
| * | bugfix: invalid mutex access in msg.cRainer Gerhards2009-01-304-3/+10
| | |
* | | bugfix: inconsistent use of mutex/atomic operations could cause segfaultRainer Gerhards2009-01-303-7/+11
| | | | | | | | | | | | | | | details are too many, for full analysis see blog post at: http://blog.gerhards.net/2009/01/rsyslog-data-race-analysis.html
* | | Merge branch 'v3-stable' into betaRainer Gerhards2009-01-274-29/+80
|\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | prepared for 3.20.3 releasev3.20.3Rainer Gerhards2009-01-193-2/+4
| | |
| * | Merge branch 'debian_lenny' into v3-stableRainer Gerhards2009-01-122-0/+38
| |\| | | | | | | | | | | | | Conflicts: ChangeLog
| | * fixed a potential segfault condition with $AllowedSender directiveRainer Gerhards2009-01-122-0/+33
| | | | | | | | | | | | | | | | | | On HUP, the root pointers were not properly cleaned up. Thanks to Michael Biebel, olgoat, and Juha Koho for reporting and analyzing the bug.
| * | Merge branch 'debian_lenny' into v3-stableRainer Gerhards2008-12-183-29/+38
| |\|
| | * Merge branch 'v2-stable' into debian_lennyRainer Gerhards2008-12-183-22/+33
| | |\
| | | * bugfix: "$CreateDirs off" also disabled file creationRainer Gerhards2008-12-182-20/+27
| | | | | | | | | | | | | | | | | | | | Thanks to William Tisater for analyzing this bug and providing a patch. The actual code change is heavily based on William's patch.
| | * | doc bugfix: some spelling errors in man pages correctedGeoff Simmons2008-12-182-9/+11
| | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | bugfix: the string "Do Die" was accidently emited upon exit in non-debug modevarmojfekoj2009-01-152-2/+6
| | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | some legacy options were not correctly processedvarmojfekoj2008-12-102-3/+8
| | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | Merge branch 'v3-stable' into betaRainer Gerhards2008-12-102-3/+15
|\| | | | | | | | | | | | | | | | | | | Conflicts: tools/syslogd.c
| * | | Merge branch 'debian_lenny' into v3-stableRainer Gerhards2008-12-102-3/+14
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html net.h plugins/imtcp/imtcp.c plugins/imudp/imudp.c runtime/net.c runtime/rsyslog.h tcps_sess.c tcpsrv.c
| | * | some legacy options were not correctly processedvarmojfekoj2008-12-102-3/+6
| | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | * | backport of $AllowedSender security fixv3.18.6Rainer Gerhards2008-12-0811-54/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - security bugfix: $AllowedSender was not honored, all senders were permitted instead (see http://www.rsyslog.com/Article322.phtml) (backport from v3-stable, v3.20.9) - minor bugfix: dual close() call on tcp session closure