2168 Commits

Author SHA1 Message Date
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
ce11f7bdb8 Merge branch 'v3-stable' into beta
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
2009-01-27 14:42:23 +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
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
Rainer Gerhards
3c236053cf bugfix: "$CreateDirs off" also disabled file creation
Thanks to William Tisater for analyzing this bug and providing a patch.
The actual code change is heavily based on William's patch.
2008-12-18 12:08:57 +01:00
varmojfekoj
44e35af7a8 some legacy options were not correctly processed
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2008-12-10 15:24:48 +01:00
Rainer Gerhards
cec7043405 Merge branch 'v3-stable' into beta
Conflicts:
	tools/syslogd.c
2008-12-10 15:22:51 +01:00
Rainer Gerhards
6b1a023f25 Merge branch 'debian_lenny' into v3-stable
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
2008-12-10 15:20:27 +01:00
varmojfekoj
054ae7bf17 some legacy options were not correctly processed
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2008-12-10 14:56:12 +01:00
Rainer Gerhards
b0317d31d9 backport of $AllowedSender security fix
- 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
v3.18.6
2008-12-08 12:26:36 +01:00
Rainer Gerhards
f716ff2349 doc bugfix: v3-compatiblity document had typo in config directive
thanks to Andrej for reporting this
2008-12-05 14:41:27 +01:00
Rainer Gerhards
94cab477f5 Merge branch 'v3-stable' into beta
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	plugins/imudp/imudp.c
v3.21.9
2008-12-04 17:43:16 +01:00
Rainer Gerhards
afdccceefa security fix: imudp emitted a message when a non-permitted sender...
...tried to send a message to it. This behaviour is operator-configurable.
If enabled, a message was emitted each time. That way an attacker could
effectively fill the disk via this facility. The message is now
emitted only once in a minute (this currently is a hard-coded limit,
if someone comes up with a good reason to make it configurable, we
will probably do that).
v3.20.2
2008-12-04 14:09:38 +01:00
Rainer Gerhards
a453c7d858 prep for 3.21.8 release, added security advisory url v3.21.8 2008-12-04 12:30:57 +01:00
Rainer Gerhards
2dd15ac573 Merge branch 'v3-stable' into beta
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
2008-12-04 12:11:58 +01:00
Rainer Gerhards
d74b4fef35 added proper release date v3.20.1 2008-12-04 11:52:27 +01:00
Rainer Gerhards
4252edfebe bugfix: memory leaks in gtls netstream driver 2008-12-03 15:45:54 +01:00
Rainer Gerhards
b41bdeff56 bugfix: memory leak if sender was not permitted 2008-12-03 11:28:41 +01:00
Rainer Gerhards
a7104880ee minor: net.c did not compile if GSSAPI support was disabled 2008-12-03 10:09:00 +01:00
Rainer Gerhards
61b59a78c6 added interface function to nsd_gtls needed for ACL control
The legacy ACL system needs access to the remote sockaddr_storage
data structure. This has been implemented for the ptcp driver and
now follows for gtls. See recent commits for reason.

We also moved up the version numbers in preparation of the release.
2008-12-01 18:39:57 +01:00
Rainer Gerhards
97b89435aa bugfix: $AllowedSender handled invalidly for plain TCP transport 2008-11-29 09:47:04 +01:00
Rainer Gerhards
56f338f1b4 clarified inclusion of security fix in ChangeLog
This was imported from v3-stable, but it is important enough to
justify a duplicate entry in ChangeLog.
2008-11-29 08:32:47 +01:00
Rainer Gerhards
fae8f451ab Merge branch 'v3-stable' into beta
Conflicts:
	runtime/rsyslog.h
2008-11-29 08:02:37 +01:00
Rainer Gerhards
4879952995 minor cleanup 2008-11-29 07:48:24 +01:00
Rainer Gerhards
f0ddbed44c security bugfix: $AllowedSender was not honored,
...all senders were permitted instead
2008-11-29 07:22:48 +01:00
Rainer Gerhards
2275a915e0 bugfix: imklog did not compile on freeBSD 2008-11-24 17:48:12 +01:00
Rainer Gerhards
ae5902a244 doc bugfix: propertiey-based filter modes had inconsistency 2008-11-21 15:40:32 +01:00
Rainer Gerhards
c2fef48bd3 Merge branch 'v3-stable' into beta 2008-11-18 12:32:34 +01:00
Rainer Gerhards
2f1c53dbfe Merge branch 'v2-stable' into v3-stable
Conflicts:

	ChangeLog
2008-11-18 12:32:21 +01:00
Ken
48319cd31f bugfix: removed memory leak in ompgsql
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2008-11-18 12:30:57 +01:00
Rainer Gerhards
49dcad849e preparing for 3.12.7 release v3.21.7 2008-11-11 17:45:49 +01:00
Rainer Gerhards
c9078c7220 Merge branch 'v3-stable' into beta
Conflicts:

	ChangeLog
	doc/manual.html
2008-11-11 12:58:53 +01:00
Rainer Gerhards
05bd696ebb Merge branch 'master' into beta
Conflicts:

	ChangeLog
	configure.ac
	doc/manual.html
2008-11-11 12:54:44 +01:00
Rainer Gerhards
4cfbf894fd enhance: regex nomatch option "ZERO" has been added
This allows to return the string 0 if a regular expression is
not found. This is probably useful for storing numerical values into
database columns.
2008-11-11 12:00:11 +01:00
Rainer Gerhards
b104759ad6 added small regex check tool to repository
This is intended for debugging and considered worth preserving.
However, it has not (yet) been added to the build diag tools
as it is not considered important enough.
2008-11-11 10:12:01 +01:00
Rainer Gerhards
c291d8baca improved debug output for regular expressions inside property replacer
RE's seem to be a big trouble spot and I would like to have more
information inside the debug log. So I decided to add some additional
debug strings permanently.
2008-11-11 10:07:52 +01:00
Rainer Gerhards
b472999679 doc update: documented how to specify multiple property replacer options
abd link to new online regex generator tool added
2008-11-10 09:57:49 +01:00
Rainer Gerhards
aaab9bb8a6 minor nit: fixed branch identification v3.20.0 2008-11-05 17:34:03 +01:00
Rainer Gerhards
9048c16d90 updated release date for 3.20.0 2008-11-05 12:50:18 +01:00
Rainer Gerhards
99d63bef5f bumped version number, preparing to be new stable branch 2008-10-28 14:57:30 +01:00
Rainer Gerhards
eb14408da8 Merge branch 'v3-stable' into beta
Conflicts:

	ChangeLog
2008-10-28 14:57:22 +01:00
varmojfekoj
73d52a447c bugfix: double-free in pctp netstream driver
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2008-10-28 14:55:27 +01:00
Rainer Gerhards
ba201a9414 updated project status 2008-10-22 11:20:08 +02:00
Rainer Gerhards
162c9e91e9 preparing for 3.21.6
plus solving a compile problem for im3195 (which is not used
in practice, thus this did not show up before...)
v3.21.6
2008-10-22 10:08:10 +02:00