477 Commits

Author SHA1 Message Date
Rainer Gerhards
9e0426da5f bugfix: $omfileFlushOnTXEnd was turned on when set to off and vice versa 2010-03-09 17:52:01 +01:00
Rainer Gerhards
06387e5592 Merge branch 'v4-stable' into beta
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	tests/rt-init.c
2010-03-08 14:27:20 +01:00
Rainer Gerhards
34d1694e9d bugfix: omfile.c did not properly compile without atomics
while this worked on another platform, it did not work here, and failed
to do so for good reasons ;)
2010-03-05 12:53:15 +01:00
Rainer Gerhards
40be6cb6e7 Merge branch 'v4-stable-solaris' into master-solaris
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	tests/rt-init.c
2010-03-05 09:54:42 +01:00
Rainer Gerhards
129eeca64b relaxed need for atomic builtins 2010-03-05 09:36:45 +01:00
Rainer Gerhards
56764b912e Merge branch 'v4-stable' into v4-stable-solaris 2010-03-05 07:56:07 +01:00
Cristiano
4c060687cf streamlined BSD utmpx.h patch
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2010-03-04 09:51:28 +01:00
Yann Droneaud
71ffb32ab8 Fix Large File Support (LFS) support (bug #182)
- _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
2010-03-04 09:01:04 +01:00
Yann Droneaud
cd8c6abcc8 Includes "config.h" before any other header.
For consistency, ./configure generated "config.h" must be the first
header include through out the project.

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2010-03-04 08:00:39 +01:00
Rainer Gerhards
6cf9bf703d bugfix: potential (but very impropable) segfaults in omfile
- 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.
2010-03-02 11:32:43 +01:00
Rainer Gerhards
a16c60e782 Merge branch 'v4-stable-solaris' into master-solaris 2010-03-02 10:38:40 +01:00
Rainer Gerhards
2a494ffc41 added include needed for Solaris 2010-03-02 10:18:33 +01:00
Cristiano
d7755dd3dc solved compile problems on FreeBSD 9.0 (those caused by utmpx.h)
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2010-03-02 07:37:48 +01:00
Rainer Gerhards
abef390dae Merge branch 'beta' into master
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	tools/syslogd.c
2010-03-01 14:21:49 +01:00
Rainer Gerhards
eb3afa8000 Merge branch 'v4-stable' into tmp 2010-03-01 12:52:25 +01:00
Rainer Gerhards
7b654060b6 fixed typo that (could have) caused compilation fail under FreeBSD
Note that I now also prefer to use utmp.h if it is present - this seems
to be much better under Linux.
2010-03-01 07:57:24 +01:00
Rainer Gerhards
2c39f76037 make $ActonFileDefaultTemplate available to ompipe
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).
2010-03-01 07:33:09 +01:00
Rainer Gerhards
f12a1995e4 bugfix: fixed problem that caused compilation on FreeBSD 9.0 to fail.
bugtracker: http://bugzilla.adiscon.com/show_bug.cgi?id=181
Thanks to Christiano for reporting.
2010-02-28 18:33:08 +01:00
Michael Biebl
8750f48390 Description: Correct error in rsyslog.conf(5) man page
$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>
2010-02-28 18:24:06 +01:00
Rainer Gerhards
791d8ea863 some code cleanup 2010-02-28 17:28:52 +01:00
Rainer Gerhards
50636ba267 moved pipe code to its own module
... 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.
2010-02-28 17:18:04 +01:00
Rainer Gerhards
c2c1d7120c fully integrated parser fixes from v4.6.0
This also made necessary a parser test case updates. Acutally, the test
case was wrong, but I did not notice that before.
2010-02-25 15:29:07 +01:00
Rainer Gerhards
3644fb4b8a fully integrated parser fixes from v4.6.0
This also made necessary some parser test case updates. Acutally, the test
case was wrong, but I did not notice that before.
2010-02-25 14:23:02 +01:00
Rainer Gerhards
af5fb078d4 message parser fixes and testbench enhancements
- 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
2010-02-22 14:25:56 +01:00
Rainer Gerhards
c577e9c64c bugfix: message without MSG part could case a segfault
[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...
2010-02-22 09:31:10 +01:00
Rainer Gerhards
8149d06f97 Merge branch 'beta' 2010-02-04 16:51:53 +01:00
Rainer Gerhards
d71e8672c9 Merge branch 'v4-beta' into beta 2010-02-04 16:51:43 +01:00
Rainer Gerhards
ef193bf0ae Merge branch 'v4-stable' into v4-beta 2010-02-04 16:43:21 +01:00
varmojfekoj
8c3ab2e26f bugfix: several smaller bugs resolved after flexelint review
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2010-02-04 16:02:57 +01:00
Rainer Gerhards
4cefc40064 Merge branch 'beta'
Conflicts:
	ChangeLog
	action.c
	configure.ac
	doc/manual.html
2010-02-03 15:46:35 +01:00
Rainer Gerhards
9045537841 Merge branch 'v4-beta' into beta 2010-02-03 15:42:40 +01:00
Cristiano
66d129c9ca (slightly) enhanced support for FreeBSD by setting _PATH_MODDIR to the correct value on FreeBSD.
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2010-02-03 15:42:14 +01:00
Rainer Gerhards
38cb392672 replaced data type "bool" by "sbool" because this created some portability issues 2010-02-02 15:51:01 +01:00
Rainer Gerhards
074ec9495e backporting bugfixes from 5.2.2
- 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]
2010-01-27 09:52:15 +01:00
Rainer Gerhards
eac8ef081b fixed small misalignment 2010-01-26 15:23:57 +01:00
Rainer Gerhards
855f349238 Merge branch 'beta' 2010-01-26 12:23:53 +01:00
Rainer Gerhards
7f4972b9fa Merge branch 'v4-beta' into beta
Conflicts:
	ChangeLog
	runtime/queue.c
2010-01-26 12:09:48 +01:00
Rainer Gerhards
62e00d7a1c Merge branch 'v4-beta' into tmp
Conflicts:
	ChangeLog
2010-01-26 12:03:50 +01:00
Rainer Gerhards
bd03b86c63 bugfix: -d did not enable display of debug messages
regression from introduction of "debug on demand" mode
Thanks to Michael Biebl for reporting this bug
2010-01-19 15:49:26 +01:00
Rainer Gerhards
b88c4885b4 Merge branch 'beta'
Conflicts:
	ChangeLog
2010-01-19 14:40:55 +01:00
Rainer Gerhards
452fb9282d Merge branch 'v4-beta' into beta 2010-01-19 14:40:04 +01:00
Rainer Gerhards
9a0e844c91 Merge branch 'v4-stable' into v4-beta 2010-01-19 14:39:55 +01:00
Michael Biebl
112b69d983 Fix a typo regarding syslog.h and syslog(3)
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2010-01-19 14:39:24 +01:00
Rainer Gerhards
9901996b5b Merge branch 'v4-beta' into beta
Conflicts:
	ChangeLog
2010-01-15 17:03:51 +01:00
Rainer Gerhards
5b4e06fc28 bugfix: rsyslog hangs when writing to a named pipe which nobody was reading.
Thanks to Michael Biebl for reporting this bug.
2010-01-15 17:01:10 +01:00
Rainer Gerhards
58870fc483 Merge branch 'beta' 2010-01-12 13:34:01 +01:00
Rainer Gerhards
d727748481 Merge branch 'v4-beta' into beta 2010-01-12 13:33:51 +01:00
Naoya Nakazawa
009738a0ac fixed a memory leak when sending messages in zip-compressed format
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2010-01-11 12:34:46 +01:00
Rainer Gerhards
abdc2870f1 worked around an issue where omfile failed to compile on 32 bit platforms
...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]
2009-12-09 16:49:07 +01:00
Rainer Gerhards
68bacb9a93 Merge branch 'v4-devel' 2009-12-04 13:20:24 +01:00