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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'v5-stable'	Rainer Gerhards	2011-07-13	1	-7/+9
\|\
\| *	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2011-07-11	1	-7/+9
\| \|\
\| \| *	doc: updated rsyslog.conf man page with new syntaxes	Rainer Gerhards	2011-07-11	1	-7/+9
\| \| \|
* \| \|	Merge branch 'master-newconf'	Rainer Gerhards	2011-07-12	3	-244/+16
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog tools/omfile.c
\| * \| \|	removed compatibility mode as we expect people have adjusted their confs by now	Rainer Gerhards	2011-07-12	1	-234/+13
\| \| \| \|
\| * \| \|	removed emergency config, do error reporting on fatal config file error	Rainer Gerhards	2011-07-12	1	-1/+1
\| \| \| \|
\| * \| \|	cleanup, removing now unused code	Rainer Gerhards	2011-07-11	2	-6/+0
\| \| \| \|
\| * \| \|	milestone/[PARTWORK]: made sure all legacy selectors work	Rainer Gerhards	2011-07-09	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... except for the not guaranteed $outchannel construct, which we could not fix without syntax change. Shouldn't hurt too many.
\| * \| \|	milestone/[PARTWORK]: implemented comparison operations	Rainer Gerhards	2011-07-08	1	-1/+0
\| \| \| \|
\| * \| \|	milestone:/[PARTWORK]: config is processed using new parser, except...	Rainer Gerhards	2011-07-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... for "if" filters (more work to come, probably lots of more work... ;))
\| * \| \|	milestone/[NONWORKING]: first integration of new parser, rules are not yet ↵	Rainer Gerhards	2011-07-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	handled
\| * \| \|	milestone: grammar integrated in rsyslog build system	Rainer Gerhards	2011-07-05	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'v5-devel'	Rainer Gerhards	2011-07-11	1	-1/+16
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h
\| * \ \ \	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2011-07-11	1	-1/+16
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h
\| \| * \| \|	added warning message for old-style outchannel syntax	Rainer Gerhards	2011-07-11	1	-1/+8
\| \| \| \| \|
\| \| * \| \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2011-07-11	1	-1/+9
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html tests/diag.sh
\| \| \| * \|	support for :omfile: forward compatibility directive	Rainer Gerhards	2011-07-11	1	-1/+9
\| \| \| \| \|
\| * \| \| \|	issue a warning if old omusrmsg action syntax is used	Rainer Gerhards	2011-07-06	1	-2/+10
\| \| \| \| \|
\| * \| \| \|	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2011-07-06	1	-1/+3
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog doc/manual.html
\| * \| \| \|	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2011-06-16	1	-1/+1
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: runtime/rsyslog.h
\| * \| \| \| \|	bugfix: error state not correctly set for gone-away config directive	Rainer Gerhards	2011-06-10	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'v4-devel' into v5-devel	Rainer Gerhards	2011-05-09	1	-2/+2
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog runtime/parser.c tests/Makefile.am
\| \| * \ \ \ \	Merge branch 'v4-stable' into v4-devel	Rainer Gerhards	2011-05-09	1	-2/+2
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tcpsrv.c tests/Makefile.am tests/tcpflood.c
\| * \| \ \ \ \ \	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2011-05-03	1	-1/+1
\| \|\ \ \ \ \ \ \
* \| \ \ \ \ \ \ \	Merge branch 'beta'	Rainer Gerhards	2011-07-06	1	-2/+12
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h
\| * \| \| \| \| \| \| \|	issue a warning if old omusrmsg action syntax is used	Rainer Gerhards	2011-07-06	1	-2/+10
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'v5-stable' into beta	Rainer Gerhards	2011-07-06	1	-1/+3
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog doc/manual.html
\| \| * \| \| \| \| \| \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2011-07-06	1	-1/+3
\| \| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| / \| \| \| \| \|_\|_\|_\|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| \| \| * \| \| \| \|	added support for the ":omusrmsg:" syntax in configuring user messages	Rainer Gerhards	2011-07-06	1	-1/+3
\| \| \| \| \|_\|_\|/ \| \| \| \|/\| \| \|
* \| \| \| \| \| \|	Merge branch 'beta'	Rainer Gerhards	2011-06-21	2	-6/+6
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html tests/Makefile.am tests/manytcp-too-few-tls.sh
\| * \| \| \| \| \|	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!)
\| * \| \| \| \| \|	bugfix: $ActionFileDefaultTemplate did not work	Rainer Gerhards	2011-06-02	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	closes: http://bugzilla.adiscon.com/show_bug.cgi?id=262
* \| \| \| \| \| \|	added a first implementation of a DNS name cache	Rainer Gerhards	2011-06-06	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	this still has a couple of weaknesses, like no size limit, no expiration of entries, suboptimal algorithms -- but it should perform better than what we had previously. Implementation will be improved based on feedback during the next couple of releases
* \| \| \| \| \| \|	regression fix: config validation code affected by recent changes	Rainer Gerhards	2011-05-30	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	did not return with proper return value
* \| \| \| \| \| \|	Merge branch 'beta'	Rainer Gerhards	2011-05-21	1	-3/+2
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog plugins/imrelp/imrelp.c
\| * \| \| \| \| \|	Merge branch 'v5-stable' into beta	Rainer Gerhards	2011-05-09	2	-4/+3
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tools/omfwd.c
\| \| * \| \| \| \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2011-05-09	1	-2/+2
\| \| \|\\| \| \| \| \| \| \| \|_\|/ / \| \| \|/\| \| \|
\| \| \| * \| \|	bugfix: invalid storage type for config variables	Rainer Gerhards	2011-05-09	1	-1/+1
\| \| \| \| \| \|
\| \| \| * \| \|	bugfix: stream driver mode was not correctly set on tcp ouput on big endian ↵	Tomas Heinrich	2011-05-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	systems. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
\| \| * \| \| \|	bugfix(minor): improper template function call in syslogd.c	Rainer Gerhards	2011-04-19	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	merge fix: made mistake when merging in v5-devel changes, now fixing	Rainer Gerhards	2011-04-27	2	-18/+1
\| \| \| \| \| \|
* \| \| \| \| \|	step: moved main message queue activation to after priv drop	Rainer Gerhards	2011-04-27	1	-12/+1
\| \| \| \| \| \|
* \| \| \| \| \|	step: config-specific module list used during config processing	Rainer Gerhards	2011-04-27	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	step: shuffled module-related code from syslogd.c to rsconf.c	Rainer Gerhards	2011-04-27	1	-217/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... plus some minor cleanup/code shuffle
* \| \| \| \| \|	Merge branch 'v5-devel'	Rainer Gerhards	2011-04-26	2	-29/+22
\|\ \ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tools/omfile.c
\| * \| \| \| \|	bugfix: pipes not opened in full priv mode when privs are to be dropped	Rainer Gerhards	2011-04-26	1	-5/+13
\| \| \| \| \| \|
\| * \| \| \| \|	bugfix: do not open files with full privileges, if privs will be dropped	Rainer Gerhards	2011-04-26	1	-36/+15
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This make the privilege drop code more bulletproof, but breaks Ubuntu's work-around for log files created by external programs with the wrong user and/or group. Note that it was long said that this "functionality" would break once we go for serious privilege drop code, so hopefully nobody still depends on it (and, if so, they lost...).
* \| \| \| \|	step: outchannel list integrated into main config object	Rainer Gerhards	2011-04-26	1	-41/+20
\| \| \| \| \|
* \| \| \| \|	step: moved config validation code	Rainer Gerhards	2011-04-26	1	-20/+0
\| \| \| \| \|