rsyslog - Modifications to rsyslog---see v3-stable-kaz branch

	Commit message (Collapse)	Author	Age	Files	Lines
*	undoing v6.1 config scoping interface, part I	Rainer Gerhards	2012-01-18	1	-48/+48
\| \| \| \|	The most common files are now changed, more needs to be done.
*	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-01-18	1	-1/+21
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html plugins/imptcp/imptcp.c
\| *	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2012-01-16	1	-1/+21
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tools/syslogd.c
\| \| *	FQDN hostname for multihomed host was not always set to the correct name	Tomas Heinrich	2012-01-16	1	-2/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	..if multiple aliases existed. Thanks to Tomas Heinreich for the patch. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
\| \| *	Merge branch 'v4-stable' into v4-beta	Rainer Gerhards	2011-08-30	1	-1/+1
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog
\| \| \| *	bugfix: off-by-one(two) bug in legacy syslog parser	Rainer Gerhards	2011-08-10	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'v5-stable' into beta	Rainer Gerhards	2011-09-26	1	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| * \| \|	bugfix: rsyslogd -v always said 64 atomics were not present	mono_matsuko	2011-09-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* \| \| \|	Merge branch 'v5-stable' into beta	Rainer Gerhards	2011-06-21	1	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html tests/diag.sh tests/sndrcv_drvr.sh
\| * \| \|	bugfix: problems in failover action handling	Rainer Gerhards	2011-06-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	closes: http://bugzilla.adiscon.com/show_bug.cgi?id=270 (not yet confirmed!)
* \| \| \|	Merge branch 'v5-stable' into beta	Rainer Gerhards	2011-05-09	1	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tools/omfwd.c
\| * \| \|	bugfix(minor): improper template function call in syslogd.c	Rainer Gerhards	2011-04-19	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'v5-devel'	Rainer Gerhards	2011-03-31	1	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.ac doc/manual.html doc/rsyslog_conf.html runtime/msg.c runtime/rsyslog.h template.c
\| * \| \|	Merge branch 'v5-stable' into v5-beta	Rainer Gerhards	2011-03-16	1	-1/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tests/Makefile.am
\| \| * \| \|	fixed a regression of last patch and some cleanup	Rainer Gerhards	2011-03-16	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'v5-beta'	Rainer Gerhards	2011-03-11	1	-0/+5
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html plugins/omlibdbi/omlibdbi.c tests/Makefile.am tests/diag.sh
\| * \| \| \|	Merge branch 'v5-stable' into v5-beta	Rainer Gerhards	2011-03-08	1	-0/+5
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog tests/Makefile.am tools/syslogd.c
\| \| * \| \|	bugfix(kind of): tell users that config graph can currently not be generated	Rainer Gerhards	2011-03-08	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	closes: http://bugzilla.adiscon.com/show_bug.cgi?id=232
* \| \| \| \|	Merge branch 'v5-beta'	Rainer Gerhards	2011-02-25	1	-2/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| * \| \| \|	cosmetic: removing commented-out testing aid	Rainer Gerhards	2011-02-25	1	-1/+0
\| \| \| \| \|
\| * \| \| \|	bugfix (minor): warning message suggested invalid compatibility mode	Rainer Gerhards	2011-02-22	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'v5-beta'	Rainer Gerhards	2011-02-18	1	-3/+2
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html runtime/glbl.c tools/omdiscard.c
\| * \| \| \|	cleanup: no longer parameter in iminternal system removed	Rainer Gerhards	2011-02-16	1	-3/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch 'v5-beta'	Rainer Gerhards	2011-02-11	1	-3/+36
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| * \| \| \|	fixed some compile issues in recent systemd patch	Rainer Gerhards	2011-02-11	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Improved systemd socket activation support	Marius Tomaschewski	2011-02-11	1	-3/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support for multiple unix sockets and activation in forking mode Signed-off-by: Marius Tomaschewski <mt@suse.de>
* \| \| \| \|	Merge branch 'v5-devel'	Rainer Gerhards	2010-12-17	1	-11/+8
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog action.c plugins/imudp/imudp.c runtime/glbl.c
\| * \| \| \|	Merge branch 'v4-devel' into v5-devel	Rainer Gerhards	2010-12-17	1	-3/+0
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/imfile.html doc/manual.html plugins/imudp/imudp.c runtime/msg.h tools/syslogd.c
\| \| * \| \|	added $LocalHostName config directive & some bugfixing	Rainer Gerhards	2010-12-16	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- added $LocalHostName config directive - bugfix: local hostname was pulled too-early, so that some config directives (namely FQDN settings) did not have any effect
\| \| * \| \|	cleanup of cosmetic nit (result of clang static code analyser run)	Rainer Gerhards	2010-12-16	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	Merge branch 'v4-stable' into v4-devel	Rainer Gerhards	2010-12-16	1	-2/+0
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \|	Conflicts: runtime/parser.c
\| \| \| * \|	some cleanup based on clang static analyzer results	Rainer Gerhards	2010-12-16	1	-2/+0
\| \| \| \| \|
\| * \| \| \|	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2010-12-17	1	-1/+1
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| \| * \| \|	fixed cosmetic nit (as a result of clang static code analyzer run)	Rainer Gerhards	2010-12-16	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	Merge branch 'v4-devel' into v5-beta	Rainer Gerhards	2010-10-15	1	-1/+1
\| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: Makefile.am tests/tcpflood.c
\| * \| \| \|	bugfix: one type of 64bit atomics was enabled when 32bit atomics were supported	Rainer Gerhards	2010-12-02	1	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	also cleaned up some minor things
* \| \| \| \|	Merge branch 'v5-devel'	Rainer Gerhards	2010-10-05	1	-4/+3
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c runtime/rsyslog.h
\| * \| \| \|	minor: improved error message when already running	Rainer Gerhards	2010-09-17	1	-4/+3
\| \| \| \| \|
* \| \| \| \|	Merge branch 'v5-devel'	Rainer Gerhards	2010-09-08	1	-29/+32
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac
\| * \| \| \|	Merge branch 'systemd' into v5-devel	Rainer Gerhards	2010-09-08	1	-29/+32
\| \|\ \ \ \
\| \| * \| \| \|	acquire /dev/log socket optionally from systemd	Lennart Poettering	2010-09-07	1	-29/+32
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'master' into tmp	Rainer Gerhards	2010-08-11	1	-1/+4
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html plugins/omudpspoof/omudpspoof.c runtime/rsyslog.h also updated omuxsock and imptcp to new interfaces
\| * \| \| \| \|	Merge branch 'v4-devel' into master	Rainer Gerhards	2010-08-11	1	-1/+1
\| \|\ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| / / \| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \|	Conflicts: Makefile.am tests/tcpflood.c
\| \| * \| \|	Merge branch 'v4-stable-imptcp' into tmp	Rainer Gerhards	2010-08-11	1	-1/+1
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: Makefile.am configure.ac runtime/rsyslog.h tests/Makefile.am
\| \| \| * \| \|	added imptcp	Rainer Gerhards	2010-08-10	1	-1/+1
\| \| \| \| \|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	imptcp is a simplified, Linux-specific and potentielly fast syslog plain tcp input plugin (NOT supporting TLS!)
\| \| \| * \|	temporary bugfix replaced by permanent one for...	Rainer Gerhards	2010-03-31	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	...message-induced off-by-one error (potential segfault) (see 4.6.2) The analysis has been completed and a better fix been crafted and integrated.
\| * \| \| \|	changed omudpspoof default spoof address to simplify typical use case	Rainer Gerhards	2010-08-05	1	-0/+3
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	added support to save/restore rsyslog core action settings...	Rainer Gerhards	2010-07-23	1	-5/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... but not those of plugins (which are at least as important as the core ones). So this is an interim commit.
* \| \| \|	moving towards scoping inside rsyslog.conf	Rainer Gerhards	2010-07-21	1	-50/+50
\|/ / / \| \| \| \| \| \| \| \| \|	first step: adding object-type specifier to config statement table
* \| \|	milestone(BUGGY): batch now pushed down to action	Rainer Gerhards	2010-06-15	1	-12/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	at least in important cases (not for non-direct action queues and some other minor things). This version is definitely buggy, but may be tried with success on a non-production system. I will continue to work on the correctness, but needed to commit now to get a baseline.