2426 Commits

Author SHA1 Message Date
varmojfekoj
5d4fd0e2ef fixed a potential segfault problem in gssapi code
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2009-03-02 15:24:36 +01:00
Rainer Gerhards
924ceb305d Merge branch 'beta'
Conflicts:
	ChangeLog
	Makefile.am
	configure.ac
	doc/manual.html
2009-02-24 14:52:49 +01:00
Rainer Gerhards
b36d9c9294 updated changelog to reflect patch applied 2009-02-24 14:43:15 +01:00
Michael Biebl
21dddac141 Call PKG_PROG_PKG_CONFIG m4 macro unconditionally.
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.
2009-02-24 14:42:07 +01:00
Rainer Gerhards
24a36fd142 decreased GNUtls version requirement
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).
2009-02-24 14:38:53 +01:00
Michael Biebl
80c4b7a560 doc fix: don't use absolute paths for $ModLoad 2009-02-24 14:30:39 +01:00
Rainer Gerhards
c9486ba5ea reflected build system changes in change log 2009-02-24 13:56:48 +01:00
Michael Biebl
1b912a970c Improve mysql configure check (for unusual paths)
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.
2009-02-24 13:09:45 +01:00
Michael Biebl
1ca5268698 Separate macro file for atomic operations
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)
2009-02-24 13:09:45 +01:00
Michael Biebl
6685cd0c48 Split the m4 macros into a separate directory 2009-02-24 13:09:45 +01:00
Michael Biebl
e4620ab3a4 Use pkg-config for GnuTLS configure check
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.
2009-02-24 13:09:44 +01:00
Michael Biebl
0f03e5996a Call PKG_PROG_PKG_CONFIG m4 macro unconditionally.
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.
2009-02-24 13:09:44 +01:00
Michael Biebl
1448e2486e make all cflags and libs variables uppercase
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.
2009-02-24 13:09:44 +01:00
Rainer Gerhards
3c760a3dbc changed TLS link on manual homepage to native TLS doc
... 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.
2009-02-10 15:31:47 +01:00
Rainer Gerhards
96e9bff86d preparing for 3.20.4 v3.20.4 2009-02-09 16:46:39 +01:00
Rainer Gerhards
f5ad2359c9 doc bugfix: dist tarball missed 2 files, had one extra file that no longer belongs into it.
Thanks to Michael Biebl for pointing this out.
2009-02-09 15:43:55 +01:00
Michael Biebl
d742b251a6 bugfix: invalid ./configure settings for RFC3195
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2009-02-06 13:59:43 +01:00
Rainer Gerhards
91fd3bafda docfix: copy&paste error 2009-02-03 09:45:20 +01:00
Rainer Gerhards
46d7840b25 Merge branch 'lastmessage'
Conflicts:
	ChangeLog
2009-02-02 15:30:14 +01:00
Rainer Gerhards
6ce4a9d605 added new config directive $RepeatedMsgContainsOriginalMsg
so that the "last message repeated n times" messages, if generated, may
have an alternate format that contains the message that is being repeated.
Note that this is on an action-by-action basis.
2009-02-02 15:28:24 +01:00
Rainer Gerhards
f826c284d2 updated project status after 3.21.10 release 2009-02-02 14:45:03 +01:00
Rainer Gerhards
051beeac57 prepared for 3.21.10 release v3.21.10 2009-02-02 14:36:32 +01:00
Rainer Gerhards
0d69059091 Merge branch 'beta' 2009-01-30 15:41:29 +01:00
Rainer Gerhards
25245cc682 added info if atomic ops are available to rsyslogd -v output 2009-01-30 15:40:53 +01:00
Rainer Gerhards
a2f547fdbf Merge branch 'beta' 2009-01-30 13:53:37 +01:00
Rainer Gerhards
b54797da05 Merge branch 'v3-stable' into beta, conclude fix for race
Conflicts:
	ChangeLog
	runtime/msg.c
2009-01-30 13:52:49 +01:00
Rainer Gerhards
2cfaf5f86a bugfix: inconsistent use of mutex/atomic operations could cause segfault
details are too many, for full analysis see blog post at:
http://blog.gerhards.net/2009/01/rsyslog-data-race-analysis.html
2009-01-30 13:49:41 +01:00
Rainer Gerhards
a2bfabc1c0 finished adding race condition fix (mostly done by merge) 2009-01-30 13:43:57 +01:00
Rainer Gerhards
77b363fb4e Merge branch 'debian_lenny' into v3-stable 2009-01-30 13:41:31 +01:00
Rainer Gerhards
82d7abc1f4 bugfix: invalid mutex access in msg.c 2009-01-30 13:41:12 +01:00
Rainer Gerhards
94f8ca5e2c added useful internal doc link 2009-01-30 13:28:10 +01:00
Rainer Gerhards
c5ece55043 minor doc: updated project status 2009-01-29 16:47:09 +01:00
Rainer Gerhards
51d3552866 preparing for 4.1.4 release v4.1.4 2009-01-29 15:20:05 +01:00
Rainer Gerhards
06f211d230 Merge branch 'drd-testing' 2009-01-29 12:05:39 +01:00
Rainer Gerhards
14d5cc7f55 fixed atomic operations 2009-01-29 11:58:26 +01:00
Rainer Gerhards
5453699428 fixed copy&paste error
... one should at least compile before comitting - sorry, been so
eager to push that out.
2009-01-28 13:02:45 +01:00
Rainer Gerhards
35673b12c4 bugfix: proper message locking on message destruct
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.
2009-01-27 22:41:14 +01:00
Rainer Gerhards
4c7ab3bcc6 Merge branch 'beta'
Conflicts:
	tools/omfile.c
2009-01-27 16:58:30 +01:00
Rainer Gerhards
ce11f7bdb8 Merge branch 'v3-stable' into beta
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
2009-01-27 14:42:23 +01:00
Rainer Gerhards
ead2c355e3 bugfix: unitialized mutex was used in msg.c:getPRI
This was subtle, because getPRI is called as part of the debugging code
(always executed) in syslogd.c:logmsg.
2009-01-26 22:30:55 +01:00
Rainer Gerhards
d5360aa574 updated project status after 3.20.3 release 2009-01-19 11:18:39 +01:00
Rainer Gerhards
40514075c6 prepared for 3.20.3 release v3.20.3 2009-01-19 11:14:57 +01:00
varmojfekoj
e2ffeb19f9 bugfix: the string "Do Die" was accidently emited upon exit in non-debug mode
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2009-01-15 12:59:21 +01:00
Rainer Gerhards
43b9df51ba Merge branch 'debian_lenny' into v3-stable
Conflicts:
	ChangeLog
2009-01-12 14:48:38 +01:00
Rainer Gerhards
20ff1ed403 fixed a potential segfault condition with $AllowedSender directive
On HUP, the root pointers were not properly cleaned up. Thanks to
Michael Biebel, olgoat, and Juha Koho for reporting and analyzing
the bug.
2009-01-12 13:05:45 +01:00
varmojfekoj
ec2019abe2 fixed type in format string (s as string indicator missing)
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2009-01-12 12:37:41 +01:00
Rainer Gerhards
a185665be4 experimentally altered "last message repeated n times" to include msg
This was suggested by David Lang, to help identify the message that was
repeated. A problem is that I do not have the expanded template at
hand when the "last ... times" message is generated. Spending much time
on this functionality is also probably not a good thing, as the whole
functionality will be overhauled (and once this is done we will not at
all have the output template at hand). So the approach is to use a single
field - here msg - and inlcude it as a notation of what was repeated. This
is far from being perfect, but eventually good enough. I will now wait
for feedback before going any further.
2008-12-19 12:52:49 +01:00
Rainer Gerhards
98624f1bc4 Merge branch 'debian_lenny' into v3-stable 2008-12-18 13:55:24 +01:00
Rainer Gerhards
197d980f5b Merge branch 'v2-stable' into debian_lenny 2008-12-18 13:42:56 +01:00
Geoff Simmons
db23c5e79a doc bugfix: some spelling errors in man pages corrected
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2008-12-18 13:27:07 +01:00