rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-20 08:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
8,447 Commits 67 Branches 505 Tags
Commit Graph

329 Commits

Author SHA1 Message Date
Rainer Gerhards
c90bf46183 KSI: basic adaption to new API 2015-06-26 08:57:34 +02:00
Michael Biebl
6fbacdc41d typo fix: paramter → parameter 
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=772490
 2015-06-08 20:23:01 +02:00
Rainer Gerhards
fd499cf64b bugfix: build system strndup was used even if not present 
now added compatibility function. This came up on Solaris builds.
Thanks to Dagobert Michelsen for reporting the problem.
closes https://github.com/rsyslog/rsyslog/issues/347
 2015-05-20 18:27:43 +02:00
Dustin Koupal
51b766c33c fixing json formatting when using json-c < 0.10 2015-04-22 18:15:01 +00:00
Rainer Gerhards
d849fd6d88 omprog: enhance HUP processing 
we can now specify which signal (for a valid set) is to be
sent on HUP

see also https://github.com/rsyslog/rsyslog/issues/281
 2015-03-31 17:13:01 +02:00
Rainer Gerhards
597894e768 plumbing to re-instantiate the $AbortOnUncleanConfig functionality 
This makes rsyslog abort if any error message occured during config
processing. Howerver, this is too strict, because some messages are
really just warnings (like queue sizes too low) and do not cause
an unclean config. Nevertheless, these warnings are logged as errors
currently. So a full review and cleanup of emitted error messages
is necessary.

see also https://github.com/rsyslog/rsyslog/issues/78
 2015-02-24 13:05:49 +01:00
Janmejay Singh
35e7f12a2c fixing the condition for negative case, it was broken because the returned value was TRUE for a failed value dereference 2015-01-20 20:43:08 +05:30
Janmejay Singh
2064e7796b Mysterious bug which surfaced on Ubuntu-12.04 was caused by old json_object_object_get api exposed by json-0.9 which tried to use json_object as linked-hashtable without checking its type (o_type) first. Added the check in RS_json_object_object_get_ex to fix it. 2015-01-20 20:43:08 +05:30
Rainer Gerhards
98a0407323 omkafka: add module 2015-01-07 15:41:59 +01:00
Janmejay Singh
29cdd505e2 added a json-c type replacement for json_bool which is not present in older version (for instance, 0.9, which debian squeeze uses) 2014-12-17 11:39:31 +01:00
Rainer Gerhards
53a98c50da im/omrelp: better error message in case only anon TLS is available 2014-11-21 14:54:29 +01:00
Rainer Gerhards
1aeab8e560 Merge branch 'v8-stable' 
Conflicts:
	ChangeLog
 2014-10-29 18:23:30 +01:00
Paul Donohue
ab577745bb bugfix imkmsg: infinite loop on OpenVZ VMs 2014-10-29 18:21:49 +01:00
Rainer Gerhards
044999bab3 Merge branch 'v8-stable' 
Conflicts:
	runtime/ruleset.c
 2014-10-27 15:49:13 +01:00
Rainer Gerhards
1be4d911e9 Merge branch 'v7-stable' into v8-stable 2014-10-27 15:42:53 +01:00
Rainer Gerhards
3996fe6aca warn on invalid ruleset name 
but keep accepting it. This is a forward-compatibility change
so that users will not run into surprises when they apply 8.5.1.
 2014-10-27 15:42:08 +01:00
Rainer Gerhards
b40a45b4c2 bugfix: RainerScript: invalid ruleset names were accepted 
...during ruleset defintion, but could of course not be used when
e.g. calling a ruleset.
IMPORTANT: this may cause existing configurations to error out on start,
as they invalid names could also be used e.g. when assigning rulesets.
 2014-10-27 15:33:55 +01:00
Rainer Gerhards
ef9fad056f imfile: milestone: file is picked up again after being deleted 2014-10-21 16:00:02 +02:00
Rainer Gerhards
a407348963 refactor PRI-handling code 2014-10-08 12:50:10 +02:00
Rainer Gerhards
3d2dcb5623 Merge branch 'v8-stable' 
Conflicts:
	ChangeLog
	configure.ac
 2014-10-06 10:50:30 +02:00
Rainer Gerhards
c374cce103 Merge branch 'v7-stable' into v8-stable 
Conflicts:
	ChangeLog
	configure.ac
 2014-10-02 08:13:49 +02:00
Rainer Gerhards
5038d00c8e invalid facilities: include full rawmsg in MSG property 
Based on RFC3164 definitions, this makes a lot of sense. Thanks to
mancha for suggesting this behaviour.
 2014-10-01 10:55:24 +02:00
Rainer Gerhards
6ae6bf67e6 Merge branch 'v5-stable-prifix' into v7-stable-prifix 2014-10-01 09:58:52 +02:00
Rainer Gerhards
425fecbcbd Merge branch 'v5.8.13-prifix' into v5-stable-prifix 2014-10-01 09:57:25 +02:00
Rainer Gerhards
9d4cd9545e Merge branch 'v5.8.6-prifix' into v5.8.13-prifix 2014-10-01 09:51:31 +02:00
Rainer Gerhards
8a4ada405e prevent PRI underflow 2014-10-01 09:50:54 +02:00
Rainer Gerhards
5423769fdb build issue: json_bool seems also not present on old json-c 2014-09-30 16:37:04 +02:00
Rainer Gerhards
3c250f3079 use json_object_object_get_ex() when available 
... because the previous call is now deprecated
 2014-09-30 16:55:40 +02:00
Rainer Gerhards
b11bf2745c Merge branch 'v7-stable-prifix' into v8-stable-prifix 
WARNING: does not compile, will be fixed with next commit

Conflicts:
	configure.ac
	tools/rsyslogd.c
 2014-09-16 14:59:14 +02:00
Rainer Gerhards
1ac20ffe97 Merge branch 'v5-stable-prifix' into v7-stable-prifix 
Conflicts:
	plugins/imklog/imklog.c
	plugins/imtemplate/imtemplate.c
	plugins/imuxsock/imuxsock.c
	runtime/msg.c
	runtime/rsyslog.h
	runtime/rule.c
	runtime/syslogd-types.h
	tools/syslogd.c
 2014-09-16 14:48:29 +02:00
Rainer Gerhards
df4e90f602 Merge branch 'v5.8.13-prifix' into v5-stable-prifix 
Conflicts:
	plugins/imklog/imklog.c
	plugins/imklog/ksym.c
	runtime/rule.c
 2014-09-16 12:43:29 +02:00
Rainer Gerhards
2a9f4e6030 Merge branch 'v5.8.6-prifix' into v5.8.13-prifix 
Conflicts:
	plugins/imklog/imklog.c
 2014-09-16 12:11:09 +02:00
Rainer Gerhards
20a8056ac7 fix compile problems and cleanup 
most importantly, we do no longer use the LOG_FAC() and LOG_PRI() macro
names, which may conflict with systems names and may act other than
expected by a user.
 2014-09-16 11:46:41 +02:00
Rainer Gerhards
4526ebaca2 Merge branch 'v3-stable-prifix' into tmp 
Conflicts:
	action.c
	runtime/rsyslog.h
 2014-09-16 10:42:02 +02:00
Rainer Gerhards
7b87f91436 bugfix: improper handling of invalid PRI values 
references: CVE-2014-3634
 2014-09-16 10:19:38 +02:00
Rainer Gerhards
750824186d Merge branch 'v5.8.6-prifix' into v5.8.13-prifix 2014-09-15 17:22:59 +02:00
Rainer Gerhards
00a96dce17 add invld.* selector, fix problem with previous patch 2014-09-15 17:21:48 +02:00
Rainer Gerhards
cd6937f35b do not accept out of bounds PRI values 
further reference: CVE-2014-3634
 2014-09-15 15:10:40 +02:00
Rainer Gerhards
fb5e1ea73a nit: fix copyright year 2014-09-04 11:34:21 +02:00
Rainer Gerhards
c3a349a0b7 Merge branch 'v7-stable' into v8-stable 2014-09-04 11:33:34 +02:00
Rainer Gerhards
4aaf373bba bugfix: imfile: if a state file for a different file name was set, 
that different file (name) was monitored instead of the configured
one. Now, the state file is deleted and the correct file monitored.

closes: https://github.com/rsyslog/rsyslog/issues/103
 2014-09-04 11:32:04 +02:00
Rainer Gerhards
27ba29abfc implement parse() config object 
including the necessary plumbing to support multiple parser
instances
 2014-07-08 20:44:43 +02:00
Rainer Gerhards
90773b0ac6 mmexternal: add "interface.input" config parameter 
permits to specify what should be passed to external program
 2014-03-17 18:54:03 +01:00
Rainer Gerhards
23cfcc139d Merge branch 'v7-stable' 
Conflicts:
	configure.ac
	plugins/omrelp/omrelp.c
 2014-03-11 13:04:25 +01:00
Rainer Gerhards
31efd8507f add support for "tls-less" librelp 
we now require librelp 1.2.3, as we need the new error code definition
See also: https://github.com/rsyslog/librelp/issues/1
 2014-03-10 18:33:08 +01:00
Rainer Gerhards
30c8c4bdb1 Merge branch 'v7-stable' into master-merge 
This was a rather complicated merge as we needed to migrate some
per-action settings (v7) to action instance settings (v8).

Conflicts:
	action.c
	action.h
	doc/global.html
	runtime/glbl.c
 2014-03-03 15:49:01 +01:00
Rainer Gerhards
142332e227 bugfix: invalid error number was logged 2014-02-28 14:09:40 +01:00
Rainer Gerhards
720a3f39fa pack action parameter structure for better cache performance 2013-12-05 12:36:01 +01:00
Rainer Gerhards
6ee2dc5ddd do no longer use void* ptr in iparams as we know we deal with strings 2013-12-04 16:57:42 +01:00
Rainer Gerhards
4695ab7c3e refactor output system string handling 2013-12-04 16:49:22 +01:00