summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-05-031-0/+1
|\ | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * debug: slightly improved debug info for input module startupRainer Gerhards2012-05-031-0/+1
| |
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-121-73/+97
|\| | | | | | | | | Conflicts: ChangeLog
| * imuxsock: do not cache hostnameRainer Gerhards2012-04-121-1/+1
| |
| * Allocate LocalDomain as new stringMarius Tomaschewski2012-04-111-0/+3
| | | | | | | | | | | | | | | | LocalDomain points to "" or the domain in LocalHostName, allocate as new string before passing to SetLocalDomain or free will fail later. Signed-off-by: Marius Tomaschewski <mt@suse.com>
| * bugfix: hostname was not requeried on HUPRainer Gerhards2012-04-111-72/+93
| | | | | | | | Thanks to Marius Tomaschewski for reporting this bug.
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-03-172-1/+209
|\| | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * added tool to recover disk queue if .qi file is missing (recover_qi.pl)Kaiwang Chen2012-03-152-1/+209
| |
* | undoing v6.1 config scoping interface, part IRainer Gerhards2012-01-183-75/+75
| | | | | | | | The most common files are now changed, more needs to be done.
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-181-1/+21
|\| | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imptcp/imptcp.c
| * Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-161-1/+21
| |\ | | | | | | | | | | | | Conflicts: tools/syslogd.c
| | * FQDN hostname for multihomed host was not always set to the correct nameTomas Heinrich2012-01-161-2/+22
| | | | | | | | | | | | | | | | | | ..if multiple aliases existed. Thanks to Tomas Heinreich for the patch. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-1413-194/+178
|\| | | | | | | | | | | | | | Conflicts: plugins/imtcp/imtcp.c
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-1413-194/+178
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imfile/imfile.c plugins/omtesting/omtesting.c tcpsrv.c threads.c
| | * more license analysis & changeRainer Gerhards2012-01-1411-178/+163
| | |
| | * rsyslog.conf.5 socket module example sb imuxsockJim Hill2012-01-141-1/+1
| | |
| | * relicense parts under ASL 2.0Rainer Gerhards2012-01-111-15/+14
| | | | | | | | | | | | after carful check for copyright holder
* | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-211-2/+3
|\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | minor: slightly improved error reporting when dynafile open failsRainer Gerhards2011-10-201-2/+3
| | |
* | | Merge branch 'v5-stable' into betaRainer Gerhards2011-09-263-10/+15
|\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | bugfix: omfile returns fatal error code for things that go really wrongRainer Gerhards2011-09-261-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-stableRainer Gerhards2011-09-222-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 andRainer Gerhards2011-09-201-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-stableRainer Gerhards2011-09-153-31/+98
| | |\
| | | * Merge branch 'v4-stable' into v4-betaRainer Gerhards2011-08-301-1/+1
| | | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | | * \ Merge branch 'v4-stable' into v4-betaAndre Lorbach2011-08-051-7/+9
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | | * | | issue a warning message for old-style dynafile actionRainer Gerhards2011-07-111-1/+8
| | | | | |
| | | * | | Merge branch 'v4-stable' into v4-develRainer Gerhards2011-07-112-2/+12
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | | * \ \ \ Merge branch 'v4-stable' into v4-develRainer Gerhards2011-05-091-2/+2
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tcpsrv.c tests/Makefile.am tests/tcpflood.c
| | * | | | | | typo fixAndrew Stothard2011-09-152-2/+2
| | | |_|_|_|/ | | |/| | | |
| * | | | | | bugfix: rsyslogd -v always said 64 atomics were not presentmono_matsuko2011-09-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-08-301-3/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-08-301-3/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tools/syslogd.c
| | * | | | | bugfix: off-by-one(two) bug in legacy syslog parserRainer Gerhards2011-08-101-1/+1
| | | |_|_|/ | | |/| | |
* | | | | | Merge branch 'v5-stable' into betaAndre Lorbach2011-08-181-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| * | | | | Added debug output into message parsers needed for bugtrackingAndre Lorbach2011-08-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Changed version to 5.8.5-pre1
| * | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-07-111-7/+9
| |\| | | |
* | | | | | Merge branch 'v4-stable' into betaRainer Gerhards2011-07-111-7/+9
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | doc: updated rsyslog.conf man page with new syntaxesRainer Gerhards2011-07-111-7/+9
| | |_|_|/ | |/| | |
* | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-07-111-1/+16
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h
| * | | | added warning message for old-style outchannel syntaxRainer Gerhards2011-07-111-1/+8
| | | | |
| * | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-07-111-1/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/diag.sh
| | * | | support for :omfile: forward compatibility directiveRainer Gerhards2011-07-111-1/+9
| | | | |
* | | | | issue a warning if old omusrmsg action syntax is usedRainer Gerhards2011-07-061-2/+10
| | | | |
* | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-07-061-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/manual.html
| * | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-07-061-1/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | | added support for the ":omusrmsg:" syntax in configuring user messagesRainer Gerhards2011-07-061-1/+3
| | | |/ | | |/|
* | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-06-211-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/diag.sh tests/sndrcv_drvr.sh
| * | | bugfix: problems in failover action handlingRainer Gerhards2011-06-161-1/+1
| | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=270 (not yet confirmed!)
* | | | bugfix: $ActionFileDefaultTemplate did not workRainer Gerhards2011-06-021-5/+5
| | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=262
generated by cgit (git 2.34.1) at 2024-05-31 19:03:16 +0000