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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2011-10-21	1	-2/+3
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h
\| *	minor: slightly improved error reporting when dynafile open fails	Rainer Gerhards	2011-10-20	1	-2/+3
\| \|
* \|	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2011-09-26	1	-10/+13
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h tools/omfile.c tools/ompipe.c
\| *	bugfix: omfile returns fatal error code for things that go really wrong	Rainer Gerhards	2011-09-26	1	-3/+2
\| \| \| \| \| \| \| \| \| \|	previously, RS_RET_RESUME was returned, which lead to a loop inside the rule engine as omfile could not really recover.
\| *	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2011-09-22	2	-6/+12
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	NOTE: this merge has problems, to be fixed with follow-up commits If file creation fails due to out of memory, we can enter a tight loop. Conflicts: ChangeLog configure.ac doc/manual.html runtime/parser.c runtime/rsyslog.h tests/Makefile.am tests/tcpflood.c
\| \| *	bugfix: potential abort if ultra-large file io buffers are used and	Rainer Gerhards	2011-09-20	1	-4/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	dynafile cache exhausts address space (primarily a problem on 32 bit platforms)
\| \| *	Merge branch 'v4-stable' of git+ssh://git.adiscon.com/git/rsyslog into v4-stable	Rainer Gerhards	2011-09-15	3	-31/+98
\| \| \|\
\| \| \| *	Merge branch 'v4-stable' into v4-beta	Rainer Gerhards	2011-08-30	1	-1/+1
\| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog
\| \| \| * \	Merge branch 'v4-stable' into v4-beta	Andre Lorbach	2011-08-05	1	-7/+9
\| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog
\| \| \| * \| \|	issue a warning message for old-style dynafile action	Rainer Gerhards	2011-07-11	1	-1/+8
\| \| \| \| \| \|
\| \| \| * \| \|	Merge branch 'v4-stable' into v4-devel	Rainer Gerhards	2011-07-11	2	-2/+12
\| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| \| * \| \| \| \|	typo fix	Andrew Stothard	2011-09-15	2	-2/+2
\| \| \| \|_\|_\|/ \| \| \|/\| \| \|
* \| \| \| \| \|	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2011-09-07	1	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c
\| * \| \| \| \|	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 v5-devel	Rainer Gerhards	2011-08-30	1	-3/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog
\| * \| \| \| \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2011-08-30	1	-3/+1
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog tools/syslogd.c
\| \| * \| \| \|	bugfix: off-by-one(two) bug in legacy syslog parser	Rainer Gerhards	2011-08-10	1	-1/+1
\| \| \| \|_\|/ \| \| \|/\| \|
* \| \| \| \|	Merge branch 'v5-stable' into v5-devel	Andre Lorbach	2011-08-16	1	-0/+2
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac
\| * \| \| \|	Added debug output into message parsers needed for bugtracking	Andre Lorbach	2011-08-12	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed version to 5.8.5-pre1
* \| \| \| \|	added capability to emit config error location info for warnings	Rainer Gerhards	2011-08-09	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	otherwise, omusrmsg's warning about new config format was not accompanied by problem location.
* \| \| \| \|	Merge branch 'v5-stable' into v5-devel	Andre Lorbach	2011-08-05	1	-7/+9
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog
\| * \| \| \|	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 '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 '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 'v5-stable' into v5-devel	Rainer Gerhards	2011-06-16	1	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: runtime/rsyslog.h
\| * \| \|	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 'v4-stable' into v5-stable	Rainer Gerhards	2011-05-09	1	-2/+2
\| \|\\| \|
* \| \| \|	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
\| \| * \|	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>
* \| \| \|	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2011-05-03	1	-1/+1
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	bugfix(minor): improper template function call in syslogd.c	Rainer Gerhards	2011-04-19	1	-1/+1
\| \| \| \|
* \| \| \|	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...).
* \| \|	bugfix: RFC5424 parser confused by empty structured data	Rainer Gerhards	2011-03-22	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \|	closes: http://bugzilla.adiscon.com/show_bug.cgi?id=237
* \| \|	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-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-gtls-fix' into v5-beta	Rainer Gerhards	2011-03-06	12	-0/+12
\|\ \ \ \
\| * \| \| \|	added work-around for bug in gtls, which causes fd leak when using TLS	Bojan Smojver	2011-02-23	12	-0/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The capability has been added for module to specify that they do not like being unloaded. related bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=222 Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>