374 Commits

Author SHA1 Message Date
Rainer Gerhards
2ed8e41b31 Merge branch 'v3-stable' into beta
Conflicts:
	ChangeLog
2009-05-29 13:52:55 +02:00
Rainer Gerhards
43c45bfebc fixed problem in syslog-protocol (now RFC5424) parser
... as well as some other minor issues.
2009-05-29 13:40:04 +02:00
Rainer Gerhards
8d8befaeca Merge branch 'v3-stable' into beta
Conflicts:
	tests/Makefile.am
2009-05-28 18:23:53 +02:00
Rainer Gerhards
b47d95286b bugfix: potential segfault issue when multiple $UDPServerRun directives are specified.
Thanks to Michael Biebl for helping to debug this one.
2009-05-12 12:03:00 +02:00
Rainer Gerhards
f8d9aad082 bugfix: compile problems in im3195 2009-04-23 11:45:50 +02:00
Rainer Gerhards
51d68bb9af Merge branch 'beta' 2009-04-17 14:21:02 +02:00
Rainer Gerhards
63d3982721 Merge branch 'v3-stable' into beta 2009-04-17 14:19:43 +02:00
Rainer Gerhards
53bff58625 Merge branch 'debian_lenny' into v3-stable 2009-04-17 14:19:22 +02:00
Rainer Gerhards
9ebbe7477c Merge branch 'v2-stable' into debian_lenny 2009-04-17 14:19:02 +02:00
Rainer Gerhards
e8c94fcd89 bugfix: ompgsql did not detect problems in sql command execution
this could cause loss of messages. The handling was correct if the
connection broke, but not if there was a problem with statement
execution. The most probable case for such a case would be invalid
sql inside the template, and this is now much easier to diagnose.
2009-04-17 14:18:39 +02:00
Rainer Gerhards
a5b4cb1681 Merge branch 'beta'
Conflicts:
	ChangeLog
	tcpsrv.c
	tcpsrv.h

Note: we have a slight inconsistency, as interface version v4 was already
used for tcpsrv in this branch. We accept this inconsistency.
2009-04-09 13:44:52 +02:00
Rainer Gerhards
0cade5118f Merge branch 'v3-stable' into beta
Conflicts:
	ChangeLog
2009-04-09 13:41:38 +02:00
Rainer Gerhards
bc471f1d90 bugfix: $InputTCPMaxSessions config directive was accepted, but not honored
This resulted in a fixed upper limit of 200 connections.
2009-04-09 13:36:44 +02:00
Rainer Gerhards
ce6b7e86cd improved test suite and added test for new output module interface
The testbench has now a generic driver that can run a whole class
of test suites just by providing a config file and test cases. This
does not cover all testing needs, but a lot.
We have now added one test for the new array-passing output plugin
interface.
2009-04-03 17:54:09 +02:00
Rainer Gerhards
ec0e2c3e7d added a new way how output plugins may be passed parameters.
This is more efficient for some outputs. They new can receive fields not only
as a single string but rather in an array where each string is seperated.
2009-04-03 12:51:02 +02:00
Rainer Gerhards
eb807027af added O_CLOEXEC to open() calls
to make sure only the minimum number of file handles is left open
during a exec call. This is not a 100% solution, as there are also
some fopen() calls and, more importantly, file descriptors opened
by libraries. But it is better than nothing (and it was quick, at
least until we run into platform hell, what we will for sure ;)).
2009-04-02 15:12:57 +02:00
Rainer Gerhards
a66b69533e begining touches for putting rsyslog on spaceships 2009-04-01 14:41:32 +02:00
Rainer Gerhards
bbfa04fbe6 improved testing support
worked on ways to provide a better test suite:
- added -T rsyslogd command line option, enables to specify a directory
  where to chroot() into on startup. This is NOT a security feature but
  introduced to support testing. Thus, -T does not make sure chroot()
  is used in a secure way. (may be removed later)
- added omstdout module for testing purposes. Spits out all messages to
  stdout - no config option, no other features
- modified $ModLoad statement so that for modules whom's name starts with
  a dot, no path is prepended (this enables relative-pathes and should
  not break any valid current config)
2009-03-19 17:50:07 +01:00
Rainer Gerhards
790532bb83 fixed broken make distcheck due to invalidly stated omtemplate file 2009-03-19 14:02:00 +01:00
Rainer Gerhards
208f4e107c added output module template
so far, this is mostly some documentation, but I hope that during
the process of creating output modules out of it we will get good
questions and thus can extend the template. In any case, it should
be better than what we had so far...
2009-03-16 17:26:45 +01:00
Rainer Gerhards
4df8bb4e6b Merge branch 'beta'
Conflicts:
	doc/omrelp.html
2009-03-11 15:16:57 +01:00
Rainer Gerhards
ae7a01e137 Merge branch 'v3-stable' into beta
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
2009-03-11 15:15:34 +01:00
Rainer Gerhards
59192611db bugfix: parser did not correctly parse fields in UDP-received messages 2009-03-10 22:36:40 +01:00
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
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
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
197d980f5b Merge branch 'v2-stable' into debian_lenny 2008-12-18 13:42:56 +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
2008-12-08 12:26:36 +01:00
Rainer Gerhards
94cab477f5 Merge branch 'v3-stable' into beta
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	plugins/imudp/imudp.c
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).
2008-12-04 14:09:38 +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
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
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...)
2008-10-22 10:08:10 +02:00
Rainer Gerhards
02bb3c901d consolidated time calls during msg object creation
...this improves performance and consistency and also fixes
a bug where subsecond time properties generated by imfile, imklog and
internal messages could be slightly inconsistent.
2008-10-02 15:52:24 +02:00
Rainer Gerhards
f0732cb75b Merge branch 'beta' 2008-09-22 15:50:03 +02:00
Rainer Gerhards
1b2270ad3a Merge branch 'v3-stable' into beta
Conflicts:

	ChangeLog
	configure.ac
	doc/manual.html
2008-09-22 15:49:54 +02:00
Rainer Gerhards
571c51fe34 bugfix: imudp input module could cause segfault on HUP
It did not properly de-init a variable acting as a linked list head.
That resulted in trying to access freed memory blocks after the HUP.
2008-09-22 15:47:58 +02:00
Rainer Gerhards
760e5f0d39 performance optimization: unnecessary time() calls during message parsing removed
thanks to David Lang for his excellent performance analysis
2008-09-16 11:56:07 +02:00
Rainer Gerhards
262f61d869 added properties "inputname" and "$myhostname"
- added message property "inputname", which contains the name of the
  input (module) that generated it. Presence is depending on suport in
  each input module (else it is blank).
- added system property "$myhostname", which contains the name of the
  local host as it knows itself.
2008-09-10 15:59:53 +02:00
Rainer Gerhards
1a9ac0ced7 removed compile time fixed message size limit (was 2K)
The limit can now be set via $MaxMessageSize global config
directive (finally gotten rid of MAXLINE ;))
2008-09-02 11:38:31 +02:00
Rainer Gerhards
c2f30a2fc3 Merge branch 'beta'
Conflicts:

	ChangeLog
2008-08-15 14:02:07 +02:00
Rainer Gerhards
8a1751d1c9 Merge branch 'v3-stable' into beta
Conflicts:

	ChangeLog
	configure.ac
	doc/rsyslog_ng_comparison.html
2008-08-15 12:59:24 +02:00
Rainer Gerhards
3aa86ed554 fixed cross-platform compile problem introduced with recent change
...which fixed the imfile segfault issue.
2008-08-15 12:21:26 +02:00
Rainer Gerhards
7b456ce548 bugfix: imfile could cause a segfault upon rsyslogd HUP and termination
Thanks to lperr for an excellent bug report that helped detect this
problem.
2008-08-14 11:19:02 +02:00