3959 Commits

Author SHA1 Message Date
Rainer Gerhards
87bffff894 added one more test for imuxsock to autmatted test suite
control character escaping is now also being tested
2011-02-22 16:10:21 +01:00
Rainer Gerhards
b7ee1de6b0 the last fix introduced another regression, fixed now
The previous fix left variable lenMsg in an inconsistent state when
sanitization actually happend. This could lead to message truncation.
2011-02-22 15:35:52 +01:00
Rainer Gerhards
70bd55d51b bugfix: imuxsock does not sanitization at all (regression)
This also causes problems when NUL characters are present inside
the message (as is the case with spamd).
2011-02-22 11:55:12 +01:00
Rainer Gerhards
36c1649fc1 improved testbench, added tests for imuxsock 2011-02-21 14:08:37 +01:00
Rainer Gerhards
314d353210 fixed dumb but important typo in code...
thanks to Michael Biebl for alterting me
2011-02-21 11:41:50 +01:00
Rainer Gerhards
026f59388a bugfix: imuxsock did no longer remove trailing LF
This was a regression from the imuxsock partial rewrite. Happened
because the message is no longer run through the standard parsers.
Now imuxsock does this sanitization itself.
bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=224
2011-02-21 09:10:45 +01:00
Rainer Gerhards
4d35185317 regression: fixed compile error with --enable-debug 2011-02-21 08:14:01 +01:00
Rainer Gerhards
a8760241a3 Merge branch 'v5-beta'
Conflicts:
	plugins/imfile/imfile.c
2011-02-18 16:52:08 +01:00
Rainer Gerhards
2f1ef6164a enhance: imfile did not yet support multiple rulesets, now added
we do this directly in the beta because a) it does not affect existing
functionality and b) one may argue that this missing functionality is
close to a bug.
2011-02-18 16:04:50 +01:00
Rainer Gerhards
8538bbe5af preparing for 6.1.4 release v6.1.4 2011-02-18 11:36:26 +01:00
Rainer Gerhards
9568e7dbbb Merge branch 'v5-beta'
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	runtime/glbl.c
	tools/omdiscard.c
2011-02-18 10:51:14 +01:00
Rainer Gerhards
9f1e195f3d Merge branch 'v5-beta' of git+ssh://git.adiscon.com/git/rsyslog into v5-beta 2011-02-17 15:13:20 +01:00
Rainer Gerhards
39406781e5 bugfix: minor race condition in action.c - considered cosmetic
This is considered cosmetic as multiple threads tried to write exactly
the same value into the same memory location without sync. The method
has been changed so this can no longer happen.
2011-02-17 15:12:54 +01:00
Rainer Gerhards
c550907139 preparing for 5.7.4 release v5.7.4 2011-02-17 14:25:43 +01:00
Rainer Gerhards
84c9bbaffc Merge branch 'v5-stable' into v5-beta 2011-02-17 13:40:57 +01:00
Rainer Gerhards
237df37a86 bugfix: testbench was not activated if no Java was present on system
... what actually was a left-over. Java is no longer required.
2011-02-17 12:42:37 +01:00
Dražen Kačar
7052d3c378 bugfix: fixed compile problem due to empty structs
this occured only on some platforms/compilers. thanks to Dražen Kačar
for the fix

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2011-02-16 18:20:59 +01:00
Rainer Gerhards
772e0ae846 cleanup: no longer parameter in iminternal system removed 2011-02-16 11:46:56 +01:00
Rainer Gerhards
49c2bc380c improved error reporting for $WorkDirectory
non-existance and other detectable problems are now reported,
and the work directory is NOT set in this case
2011-02-15 11:06:15 +01:00
Rainer Gerhards
f3d354da3e bugfix: very long running actions could prevent shutdown under some circumstances
This has now been solved, at least for common situations.
2011-02-11 17:47:30 +01:00
Rainer Gerhards
6a18d25cbe removed no longer needed code 2011-02-11 17:06:20 +01:00
Rainer Gerhards
121f5ab4ec bugfix: queue engine did not properly slow down inputs in FULL_DELAY mode...
...when in disk-assisted mode. This especially affected imfile, which
created unnecessarily queue files if a large set of input file data was
to process.
2011-02-11 14:56:02 +01:00
Rainer Gerhards
b941f68aae Merge branch 'v5-beta'
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
2011-02-11 11:48:29 +01:00
Rainer Gerhards
2d67035d1b doc: added recent changes to changelog 2011-02-11 11:45:13 +01:00
Rainer Gerhards
c90079aaf0 fixed some compile issues in recent systemd patch 2011-02-11 11:25:06 +01:00
Marius Tomaschewski
1b84d59989 Improved systemd socket activation support
Support for multiple unix sockets and activation in forking mode

Signed-off-by: Marius Tomaschewski <mt@suse.de>
2011-02-11 11:13:46 +01:00
David Lang
a9736c6215 bugfix in pmsnare
when removing text from the message, decrement the length when you increment
the pointer through the message. there were a number of places where this was
missed.

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2011-02-11 07:44:09 +01:00
Rainer Gerhards
2c1021a01f enhanced imfile to support non-cancel input termination 2011-02-10 18:23:34 +01:00
Rainer Gerhards
6bad782f15 bugfix: abort if imfile reads file line of more than 64KiB
Thanks to Peter Eisentraut for reporting and analysing this problem.
bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=221
2011-02-10 17:54:09 +01:00
Rainer Gerhards
1f66eb6efa bugfix: abort if imfile reads file line of more than 64KiB
Thanks to Peter Eisentraut for reporting and analysing this problem.
bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=221
2011-02-10 17:50:41 +01:00
Rainer Gerhards
df6bad70d4 cosmetic: making comments in stream.c a bit more readable 2011-02-10 17:46:04 +01:00
David Lang
fce5fe5127 pmcisconames: bugfix for short timestamps
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2011-02-10 07:36:34 +01:00
Rainer Gerhards
7de7360ede fixed invalid help strings in configure.ac
Thanks to Michael Biebl for mentioning this problem!
2011-02-08 18:01:17 +01:00
Rainer Gerhards
ff686d8021 prepare for new version 2011-02-08 12:16:25 +01:00
David Lang
fa89eef48e added pmsnare parser module
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2011-02-08 11:46:05 +01:00
Rainer Gerhards
0a36190a5d preparing for 5.7.3 v5.7.3 2011-02-04 16:42:17 +01:00
Rainer Gerhards
819ac126e2 bugfix/omhdfs: directive $OMHDFSFileName rendered unusable
...due to a search and replace-induced bug ;)
2011-02-04 14:06:22 +01:00
Rainer Gerhards
024fdc16f7 removed invalid link from doc 2011-02-04 09:24:31 +01:00
Rainer Gerhards
233157e520 experiemental milestone: tcpflood support buffering in TLS mode
This needs to be checked, it is not yet 100% correct
2011-02-04 09:22:58 +01:00
Rainer Gerhards
0c880a4a30 fixed very recent regression in tcpsrv.c & some cleanup
forgot a debugging abort() ;)
2011-02-02 01:51:18 +01:00
Rainer Gerhards
910f635cec added support for TLS (in anon mode) to tcpflood 2011-02-02 00:45:39 +01:00
Rainer Gerhards
bea499dcb2 (somewhat) improved TLS subsystem
- improved TLS error reporting
- improved TLS startup (Diffie-Hellman bits do not need to be generated,
  as we do not support full anon key exchange -- we always need certs)
2011-02-01 22:58:30 +01:00
Rainer Gerhards
e38b545229 preparing for 6.1.3 v6.1.3 2011-02-01 14:11:45 +01:00
Rainer Gerhards
c3da462a94 fixed some regressions in imptcp
from new changes, so far unreleased versions
2011-02-01 14:00:40 +01:00
Rainer Gerhards
7974621502 Merge branch 'v5-devel'
Conflicts:
	plugins/imfile/imfile.c
	plugins/imudp/imudp.c
	plugins/ommysql/ommysql.c
2011-02-01 12:22:36 +01:00
Ariel P
a1f4330a7b added doc for new ommysql directives 2011-02-01 11:50:35 +01:00
David Lang
58cb4d57e8 added pmaixforwardedfrom message parser
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2011-02-01 11:36:27 +01:00
Victor Pereira
d2b7a55b04 experimental support for monogodb added
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2011-01-31 17:52:21 +01:00
Ariel P
44e3fb96c5 added $OMMySQLConfigFile/$OMMySQLConfigSection config directives
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2011-01-31 17:22:39 +01:00
Rainer Gerhards
fd256a09ff tcpsrv select-handler experimentally moved to multi-threading as well
first tests done with plain tcp, TLS subsystems tests need to be
carried out. No serious lab testing done so far.
2011-01-31 15:59:43 +01:00