rsyslog.git - rsyslog development for Lumberjack - various unofficial and potentially rebased branches

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix undefined ctxee problem	Milan Bartos	2012-08-21	1	-2/+4
\| \| \| \|	modified: plugins/imuxsock/imuxsock.c
*	Add support for parsing trusted properties	Milan Bartos	2012-08-21	1	-30/+121
\| \| \| \| \|	* add support for parsing trusted properties into libee event structure * add $SystemLogParseTrusted config file option to enable it (default off)
*	Merge branch 'master' of git+ssh://git.adiscon.com/git/rsyslog	Rainer Gerhards	2012-08-02	1	-1/+5
\|\
\| *	Merge branch 'beta'	Rainer Gerhards	2012-08-01	1	-1/+5
\| \|\
\| \| *	fix problem with cutting first 16 characters from message with bAnnotate on ↵	Milan Bartos	2012-08-01	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \|	modified: plugins/imuxsock/imuxsock.c
* \| \|	Fix $SystemLogSocketAnnotate	Miloslav Trmač	2012-07-31	1	-3/+2
\|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Copy bAnnotateSysSock value from old config data into the new structure * Set bUseCreds on the system log socket if bAnnotateSysSock is set * Process all CMSG records, not only the first one Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* \|	imuxsock: support for module() global config parameters added	Rainer Gerhards	2012-06-27	1	-47/+128
\| \|
* \|	implemented freeCnf() module interface & fixed some mem leaks	Rainer Gerhards	2012-06-25	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The interface was actually not present in older versions, even though some modules already used it. The implementation was now done, and not in 6.3/6.4 because the resulting memory leak was ultra-slim and the new interface handling has some potential to seriously break things. Not the kind of thing you want to add in late beta state, if avoidable.
* \|	added --enable-debugless configure option for very high demanding environments	Rainer Gerhards	2012-05-29	1	-10/+8
\|/ \| \| \| \|	This actually at compile time disables a lot of debug code, resulting in some speedup (but serious loss of debugging capabilities)
*	bugfix/imuxsock: configured hostname was not used	Rainer Gerhards	2012-04-16	1	-0/+1
\|
*	bugfix/imuxsock: solving abort if hostname was not set	Rainer Gerhards	2012-04-16	1	-2/+2
\|
*	imuxsock: mini bugfix: closed fd was tried to close a second time	Rainer Gerhards	2012-04-13	1	-3/+6
\|
*	Merge branch 'v5-beta'	Rainer Gerhards	2012-04-12	1	-6/+5
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c tools/syslogd.c
\| *	Merge branch 'v5-stable-newstats' into v5-devel	Rainer Gerhards	2012-04-12	1	-8/+7
\| \|\
\| \| *	Merge branch 'v5-stable' into v5-stable-newstats	Rainer Gerhards	2012-04-12	1	-8/+7
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: plugins/imuxsock/imuxsock.c runtime/glbl.c
\| \| \| *	imuxsock: do not cache hostname	Rainer Gerhards	2012-04-12	1	-10/+4
\| \| \| \|
\| * \| \|	Merge branch 'v5-stable-newstats' into v5-devel	Rainer Gerhards	2012-04-07	1	-26/+1
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.ac doc/manual.html
\| * \| \|	Merge branch 'v5-stable-newstats' into v5-devel	Rainer Gerhards	2012-03-14	1	-0/+3
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.ac
\| * \ \ \	Merge branch 'v5-stable-newstats' into v5-devel	Rainer Gerhards	2012-03-12	1	-5/+30
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog action.c configure.ac doc/imuxsock.html doc/manual.html runtime/queue.c
\| * \ \ \ \	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2012-03-02	1	-2/+5
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2012-03-01	1	-0/+9
\| \|\ \ \ \ \ \
* \| \| \| \| \| \| \|	imuxsock: fixed regression from last merge	Rainer Gerhards	2012-04-11	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	thanks to Brian Knox for alerting me and the initial analysis
* \| \| \| \| \| \| \|	Merge branch 'v5-stable-newstats'	Rainer Gerhards	2012-04-07	1	-4/+2
\|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: action.c configure.ac doc/imuxsock.html plugins/imklog/imklog.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c runtime/glbl.c runtime/glbl.h runtime/net.c runtime/ruleset.c tcpsrv.h tools/syslogd.c
\| * \| \| \| \| \| \|	unified use of $LocalHostIPIF among all locally-emitting inputs	Rainer Gerhards	2012-03-22	1	-26/+1
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	with the exception of imdiag, which I humbly do not think needs this capabilit (even counter-productive for testbench use).
\| * \| \| \| \| \|	Merge branch 'v5-stable' into v5-stable-newstats	Rainer Gerhards	2012-03-14	1	-0/+3
\| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| / \| \| \| \|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: plugins/imuxsock/imuxsock.c runtime/queue.c runtime/queue.h
\| * \| \| \| \|	imuxsock did ignore configured IP if - always used eth0 if one was set ;)	Rainer Gerhards	2012-03-10	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	added capability to use a local interface IP address as fromhost-ip for imuxsock	Rainer Gerhards	2012-03-06	1	-5/+30
\| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	new config directives: $IMUXSockLocalIPIF
* \| \| \| \|	Merge branch 'v6-stable'	Rainer Gerhards	2012-03-17	1	-0/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: plugins/imuxsock/imuxsock.c runtime/queue.c runtime/queue.h
\| * \ \ \ \	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-03-14	1	-1/+4
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|
\| \| * \| \| \|	changed statsobj interface and added better doc	Rainer Gerhards	2012-03-14	1	-1/+4
\| \| \|/ / /
* \| \| \| \|	Merge branch 'v6-stable'	Rainer Gerhards	2012-03-02	1	-1/+4
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: plugins/imuxsock/imuxsock.c
\| * \| \| \|	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-03-02	1	-2/+5
\| \|\\| \| \|
\| \| * \| \|	Fix for "/run/systemd/journal/syslog" detection	Marius Tomaschewski	2012-03-02	1	-2/+5
\| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Changed to check "/run/systemd/journal" directory and not the socket, as the socket may not exists [e.g. is not activated].
* \| \| \|	screwed up during merge - solving that mess ;)	Rainer Gerhards	2012-03-01	1	-65/+6
\| \| \| \|
* \| \| \|	Merge branch 'v6-stable'	Rainer Gerhards	2012-03-01	1	-0/+68
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: plugins/imuxsock/imuxsock.c
\| * \| \|	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-03-01	1	-0/+9
\| \|\\| \|
\| \| * \|	Detect if to use /run/systemd/journal/syslog under systemd	Marius Tomaschewski	2012-03-01	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Detect if we have to use the new /run/systemd/journal/syslog socket instead of the /dev/log under newer systemd versions. Signed-off-by: Marius Tomaschewski <mt@suse.com>
* \| \| \|	Merge branch 'v6-stable-noscoping' into master	Rainer Gerhards	2012-01-19	1	-22/+22
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html plugins/imfile/imfile.c plugins/imklog/imklog.c plugins/immark/immark.c plugins/imptcp/imptcp.c plugins/imrelp/imrelp.c plugins/imtcp/imtcp.c plugins/imtemplate/imtemplate.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c plugins/mmsnmptrapd/mmsnmptrapd.c plugins/omtemplate/omtemplate.c runtime/glbl.c runtime/parser.c tools/omfile.c tools/syslogd.c
\| * \| \|	undoing v6.1 config scoping interface, part I	Rainer Gerhards	2012-01-18	1	-18/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The most common files are now changed, more needs to be done.
\| * \| \|	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-01-09	1	-2/+5
\| \|\\| \|
\| * \| \|	Merge branch 'v5-stable' into beta	Rainer Gerhards	2011-09-26	1	-5/+10
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| * \ \ \	Merge branch 'v5-stable' into beta	Rainer Gerhards	2011-05-09	1	-2/+7
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tools/omfwd.c
* \| \ \ \ \	Merge branch 'v5-devel' into master	Rainer Gerhards	2012-01-18	1	-5/+1
\|\ \ \ \ \ \ \| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog Makefile.am configure.ac doc/manual.html plugins/imptcp/imptcp.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c runtime/parser.c template.c tools/omfwd.c tools/syslogd.c
\| * \| \| \| \|	$IMUXSockRateLimitInterval DEFAULT CHANGED, was 5, now 0	Rainer Gerhards	2012-01-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The new default turns off rate limiting. This was chosen as people experienced problems with rate-limiting activated by default. Now it needs an explicit opt-in by setting this parameter. Thanks to Chris Gaffney for suggesting to make it opt-in; thanks to many unnamed others who already had complained at the time Chris made the suggestion ;-)
\| * \| \| \| \|	regression fix: imuxsock-received messages were malformed	Rainer Gerhards	2012-01-12	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	probably caused by a recent merge, was not present in 5.9.4
* \| \| \| \| \|	Merge branch 'v5-devel'	Rainer Gerhards	2011-12-20	1	-9/+9
\|\\| \| \| \| \|
\| * \| \| \| \|	Merge branch 'v5-stable-newstats' into v5-devel	Rainer Gerhards	2011-12-20	1	-9/+9
\| \|\ \ \ \ \ \| \| \| \|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: plugins/imuxsock/imuxsock.c
\| \| * \| \| \|	bugfix: imuxsock did truncate part of received message if it did not contain ↵	Rainer Gerhards	2011-12-20	1	-2/+5
\| \| \| \|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	a proper date. The truncation occured because we removed that part of the messages that was expected to be the date. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=295
* \| \| \| \|	Merge branch 'v5-devel'	Rainer Gerhards	2011-12-16	1	-5/+161
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c runtime/modules.c
\| * \| \| \|	imuxsock: added capability to "annotate" messages with "trusted information",	Rainer Gerhards	2011-11-29	1	-6/+157
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	which contains some properties obtained from the system and as such sure to not be faked. This is inspired by the similiar idea introduced in systemd.