summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v7-stable-libnet-frag'Rainer Gerhards2013-01-1410-6/+48
|\ | | | | | | | | Conflicts: ChangeLog
| * Merge branch 'v7-stable' into v7-stable-libnet-fragRainer Gerhards2013-01-143-2/+11
| |\
| | * Merge branch 'v5-stable' into v7-stableRainer Gerhards2013-01-143-1/+7
| | |\
| | | * doc: mention last patch in ChangeLogRainer Gerhards2013-01-141-0/+2
| | | |
| | | * bugfix: decrement string lengthTomas Heinrich2013-01-141-1/+3
| | | |
| | | * tcpflood: properly terminate when sending small filesRainer Gerhards2013-01-141-0/+2
| | | |
| | * | bugfix: omelasticsearch failed when authentication data was providedRainer Gerhards2013-01-132-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ... at least in most cases it emitted an error message: "snprintf failed when trying to build auth string" Thanks to Joerg Heinemann for alerting us. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=404
| | * | fix compile problem due to new (Solaris) compat layerRainer Gerhards2013-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | The compat layer was not fully integrated into the build system, causing ./configure to fail.
| * | | added capability to output thread-id-to-function debug infoRainer Gerhards2013-01-138-4/+39
| | | | | | | | | | | | | | | | This is a useful debug aid, but nothing of concern for regular users.
* | | | tcpflood: properly terminate when sending small filesRainer Gerhards2013-01-141-0/+2
| | | |
* | | | optimize: do date() call in template processing only if actually neededRainer Gerhards2013-01-134-58/+6
| | | |
* | | | doc bugfix: invalid parser nameRainer Gerhards2013-01-131-1/+1
| | | | | | | | | | | | | | | | Thanks to Nathan Stratton Treadway for alerting me.
* | | | fix compile problem in imklogRainer Gerhards2013-01-132-1/+2
| | | |
* | | | Correct call to submitMsg()Martin Carpenter2013-01-131-1/+1
| | | |
* | | | Merge branch 'v7-stable-libnet-frag'Rainer Gerhards2013-01-118-33/+165
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac tools/omfile.c
| * | | fix compile problem due to new (Solaris) compat layerRainer Gerhards2013-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | The compat layer was not fully integrated into the build system, causing ./configure to fail.
| * | | bump version numberRainer Gerhards2013-01-101-1/+1
| | | |
| * | | impstats: added ability to write stats records to local fileRainer Gerhards2013-01-104-26/+155
| | | | | | | | | | | | | | | | | | | | ...and avoid going through the syslog log stream. syslog logging can now also be turned off (see doc for details).
| * | | cosmetic: remove over-suspicious compiler warningsRainer Gerhards2013-01-101-5/+5
| | | |
| * | | add some more debug info to omfileRainer Gerhards2013-01-101-0/+1
| | | |
| * | | Merge branch 'v7-stable' into v7-stable-libnet-fragRainer Gerhards2013-01-099-10/+419
| |\| | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | Merge branch 'v7-stable' into v7-stable-libnet-fragRainer Gerhards2013-01-098-10/+44
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| * \ \ \ Merge branch 'v7-stable' into v7-stable-libnet-fragRainer Gerhards2012-12-203-7/+30
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/omudpspoof/omudpspoof.c
| * | | | | imudp: make debug message clearerRainer Gerhards2012-12-191-1/+1
| | | | | |
* | | | | | Merge branch 'v7-stable'Rainer Gerhards2013-01-092-8/+28
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | bugfix: some property-based filter were incorrectly parsedRainer Gerhards2013-01-092-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This usually lead to a syntax error on startup and rsyslogd not actually starting up. The problem was the regex, which did not care for double quote characters to follow in the action part - unfortunately something that can frequently happen with v6+ format. An example: :programname, isequal, "as" {action(type="omfile" ...) } Here, the part :programname, isequal, "as" {action(type="omfile" was treated as the property filter, and the rest as action part. Obviously, this did not work out. Unfortunately, such situations usually resulted in very hard to understand error messages.
| * | | | | improve config reader error messages a bit moreRainer Gerhards2013-01-091-6/+12
| | | | | |
* | | | | | Merge branch 'v7-stable'Rainer Gerhards2013-01-099-14/+391
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | | slightly improved config parser error messages when invalid escapes happenRainer Gerhards2013-01-092-1/+5
| | | | | |
| * | | | | fix typo from last patch, prevented compile on non-solarisRainer Gerhards2013-01-091-2/+2
| | | | | |
| * | | | | Use compatibility library if getifaddrs(3) not availableMartin Carpenter2013-01-091-0/+4
| | | | | |
| * | | | | compat dir: a bit restructuring and make sure config.h is includedRainer Gerhards2013-01-092-1/+5
| | | | | |
| * | | | | Add compatibility libraryRainer Gerhards2013-01-094-1/+368
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
| * | | | | remove no longer necessary configure test for sysinfo()Rainer Gerhards2013-01-091-1/+1
| | | | | |
| * | | | | Check that sysinfo(2) can return uptimeMartin Carpenter2013-01-092-1/+7
| | | | | |
| * | | | | Add LOG_AUDIT facility for eg SolarisMartin Carpenter2013-01-091-0/+3
| | |_|/ / | |/| | |
* | | | | Merge branch 'v7-stable'Rainer Gerhards2013-01-081-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | prepare for 7.2.5 releasev7.2.5Rainer Gerhards2013-01-083-3/+3
| | | | |
* | | | | Merge branch 'v7-stable'Rainer Gerhards2013-01-081-0/+1
|\| | | |
| * | | | im3195: object was not freed on exit [ASL2.0]Martin Körper2013-01-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | This and the other patch from Martin (this morning) was released under ASL 2.0 by him.
* | | | | Merge branch 'v7-stable'Rainer Gerhards2013-01-087-14/+62
|\| | | |
| * | | | bugfix: mmjsonparse errornously returned action error when no CEE cookie was ↵Rainer Gerhards2013-01-082-0/+3
| | | | | | | | | | | | | | | | | | | | present.
| * | | | bugfix: doGetFileCreateMode() had invalid validity check ;)Chandler Latour2013-01-082-5/+7
| | | | |
| * | | | bugfix: compile errors in im3195Martin Körper2013-01-082-1/+16
| | | | |
| * | | | amend last commit with license info (ASL 2.0 as of email conversation with ↵Rainer Gerhards2013-01-081-1/+2
| | | | | | | | | | | | | | | | | | | | David)
| * | | | bugfix: timeval2syslogTime cause problems on some platformsDavid Hill2013-01-082-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | ...due to invalid assumption on structure data types. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=394
| * | | | bugfix: very large memory consumption (and probably out of memory)Rainer Gerhards2013-01-072-0/+5
| | |/ / | |/| | | | | | | | | | | | | | ...when FromPos was specified in template, but ToPos not. Thanks to Radu Gheorghe for alerting us of this bug.
| * | | bugfix: on termination, actions were incorrectly calledRainer Gerhards2012-12-202-7/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that incomplete fiter evaluation was done *during the shutdown phase*. This affected only the LAST batches being processed. No problem existed during the regular run. Could usually only happen on very busy systems, which were still busy during shutdown.
* | | | update 7.3.5 release datev7.3.5Rainer Gerhards2012-12-191-1/+11
| | | |
* | | | preparing for 7.3.5 releaseRainer Gerhards2012-12-183-3/+3
| | | |