458 Commits

Author SHA1 Message Date
Rainer Gerhards
ad1b93df8a bugfix: omfwd did not properly support "template" parameter
We also added a testbench test to check for this in the future. That
in turn required new testbench tools.
2012-10-30 13:06:20 +01:00
Rainer Gerhards
e1055b6a11 testbench: complex1.sh testcase failed on slower machines
... due to too small timeout for enqueue processing --> messages got lost
2012-10-29 17:44:35 +01:00
Rainer Gerhards
1c8fa9783e testbench: add test for ruleset() and call statements 2012-10-29 12:02:07 +01:00
Rainer Gerhards
ede5d1a121 testbench: -c option no longer exists 2012-10-22 10:48:41 +02:00
Rainer Gerhards
8062f67442 Merge branch 'v6-devel' 2012-10-02 11:43:27 +02:00
Rainer Gerhards
97d94ad9af Merge branch 'v5-stable' into v6-stable 2012-10-02 11:23:27 +02:00
Rainer Gerhards
d855b1df7b minor: disable debug support in complex1.sh test 2012-10-02 11:23:01 +02:00
Rainer Gerhards
c7ccf7d322 Merge branch 'v5-stable' into v6-stable 2012-10-02 11:22:06 +02:00
Rainer Gerhards
f50511a348 cleanup 2012-10-02 11:21:40 +02:00
6387d164bb bugfix: fixed wrong bufferlength for snprintf in tcpflood.c
The problem occured when using the -f (dynafiles) option,
and caused some tests to fail.
2012-09-28 07:55:48 -07:00
Rainer Gerhards
87f415f16f Implement script optimization IF -> PRIFILT 2012-09-21 10:41:05 +02:00
Rainer Gerhards
24a248d021 Implement RainerScript prifield() function 2012-09-20 15:08:39 +02:00
Rainer Gerhards
b24af91ada Add new tests to testbench 2012-09-20 11:38:16 +02:00
Rainer Gerhards
a5dcf8cdb7 Implement RainerScript field() function 2012-09-20 11:26:24 +02:00
Rainer Gerhards
83b9b63e46 Merge branch 'v6-devel' 2012-09-20 09:44:53 +02:00
Rainer Gerhards
5cd44ee438 testbench: do not run tests requiring root privs if non-root 2012-09-20 08:42:18 +02:00
Rainer Gerhards
bbfb5662da testbench: do not run tests requiring root privs if non-root 2012-09-20 08:17:58 +02:00
Rainer Gerhards
5155f67d62 bugfix: small memory leak in imdiag
This does not have any practical problems associated with it, EXCECPT
that it caused almost all valgrind testbench tests to fail.
2012-09-19 19:25:01 +02:00
Rainer Gerhards
ae5fc58344 Add CEE test to testbench 2012-09-19 15:11:52 +02:00
Rainer Gerhards
0af3bd7919 Fix new testbench test 2012-09-14 07:51:05 +02:00
Rainer Gerhards
4ee4add6a1 Add test for script-based contains filter to testbench 2012-09-14 07:28:31 +02:00
Rainer Gerhards
8939ccfffd Merge branch 'v5-stable' into v6-stable
Conflicts:
	ChangeLog
	action.c
	configure.ac
	doc/manual.html
	runtime/ruleset.c
	template.h
	threads.c
	tools/syslogd.c
2012-08-25 11:55:41 +02:00
Rainer Gerhards
a568626d4a preparing for 5.10.0 release 2012-08-22 18:54:13 +02:00
Miloslav Trmač
00ce927aa9 Skip tests that require root if euid != 0
This will mark them as SKIPPED instead of FAILED, making it at least
in theory possible to get 0 FAILED tests even when running as an
unprivileged user.
2012-05-31 18:39:59 +02:00
Miloslav Trmač
6861810b73 Don't run valgrind tests if imdiag is not enabled
Valgrind tests depend on imdiag as well.
2012-05-31 18:39:17 +02:00
Rainer Gerhards
6625450cbe Merge branch 'v5-beta'
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
2012-05-10 10:17:18 +02:00
Rainer Gerhards
24a81f9950 Merge branch 'v5-stable' into v5-beta
Conflicts:
	ChangeLog
2012-05-10 08:23:12 +02:00
Rainer Gerhards
d86a212255 bugfix/tcpflood: sending small test files did not work correctly 2012-05-10 08:03:22 +02:00
Rainer Gerhards
5494790ece bugfix: abort during startup when rsyslog.conf v6+ format was used in a certain way 2012-02-02 16:47:19 +01:00
Rainer Gerhards
03cf2a5113 ommysql: added support for v6 config format 2012-02-02 16:25:59 +01:00
Rainer Gerhards
e770177555 Merge branch 'v5-devel'
Conflicts:
	ChangeLog
2011-10-21 15:03:53 +02:00
Rainer Gerhards
e61672c693 removed dependency on gcrypt for recently-enough GnuTLS
see: http://bugzilla.adiscon.com/show_bug.cgi?id=289
2011-10-17 15:49:20 +02:00
Rainer Gerhards
16f06168e1 Merge branch 'v5-stable' into v5-devel
Conflicts:
	ChangeLog
2011-10-17 15:26:11 +02:00
Rainer Gerhards
359ddad3c5 Merge branch 'beta'
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
2011-10-17 14:53:22 +02:00
Rainer Gerhards
b0d33ab780 Merge branch 'v5-stable' into beta
Conflicts:
	ChangeLog
2011-10-13 08:18:08 +02:00
Rainer Gerhards
cf1aaf14fa fixed compiler warnings in tcpflood.c 2011-10-06 11:42:47 +02:00
Rainer Gerhards
e5d0f176fc Merge branch 'beta'
Conflicts:
	configure.ac
	doc/manual.html
	tests/Makefile.am
2011-08-31 13:12:19 +02:00
Rainer Gerhards
0509f14041 preparing for 6.1.12 release 2011-08-31 13:00:18 +02:00
Rainer Gerhards
fa5c1371db preparing for 6.3.3 2011-07-13 14:49:14 +02:00
Rainer Gerhards
bb8ab61f4f reverting back to non-debug settings
debug settings in testbench were accidently left on, including a
special test case
2011-07-13 13:49:34 +02:00
Rainer Gerhards
2a2a9716f7 Merge branch 'master-newconf'
Conflicts:
	ChangeLog
	tools/omfile.c
2011-07-12 12:39:10 +02:00
Rainer Gerhards
a5bc2a8b4b removed emergency config, do error reporting on fatal config file error 2011-07-12 12:14:47 +02:00
Rainer Gerhards
cefa1fac08 fixed lexer: facilities local0-local7 were not correctly handled 2011-07-11 16:51:30 +02:00
Rainer Gerhards
3b63b155ed Merge branch 'v5-devel'
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	runtime/rsyslog.h
2011-07-11 11:24:08 +02:00
Rainer Gerhards
4e6a10161b Merge branch 'v5-stable' into beta
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	runtime/rsyslog.h
2011-07-11 11:02:55 +02:00
Rainer Gerhards
ad296ff1be Merge branch 'v5-stable' into v5-devel
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	runtime/rsyslog.h
2011-07-11 10:48:33 +02:00
Rainer Gerhards
398966be6d Merge branch 'v4-stable' into v5-stable
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	tests/diag.sh
2011-07-11 10:08:13 +02:00
Rainer Gerhards
dc1dd284c2 preparing for 4.6.7 release 2011-07-11 08:55:53 +02:00
Rainer Gerhards
5e2b03a31c cleaup & emergency config system reactivated 2011-07-09 18:31:50 +02:00
Rainer Gerhards
b035298e30 preparing for 6.3.2 2011-07-06 09:43:42 +02:00