summaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v5-devel'Rainer Gerhards2011-03-314-2/+398
|\ | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html doc/rsyslog_conf.html runtime/msg.c runtime/rsyslog.h template.c
| * Merge branch 'v5-beta' into v5-develRainer Gerhards2011-03-314-2/+398
| |\ | | | | | | | | | | | | Conflicts: ChangeLog
| | * fixed problem in testbench & added new test (not yet integrated)Rainer Gerhards2011-03-301-1/+4
| | | | | | | | | | | | | | | The test is a setup scenario for this bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=241
| | * Force ANSI SQL treatment of strings for PostgresChristian Kastner2011-03-291-1/+6
| | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | * did mapping of data items to database table columnsRainer Gerhards2011-03-291-14/+9
| | | | | | | | | | | | to facilitate testing
| | * sm_cust_bindcdr: custom date parsing addedRainer Gerhards2011-03-281-10/+90
| | |
| | * sm_bind_cdr: added capability to configure "allowed IPs"Rainer Gerhards2011-03-221-3/+80
| | |
| | * added internal processing of BIND recordsRainer Gerhards2011-03-221-6/+115
| | | | | | | | | | | | | | | still some questions outstanding, so actual SQL statement is not usable at the moment
| | * bugfix: strgen could not be used together with database outputsRainer Gerhards2011-03-211-1/+1
| | | | | | | | | | | | | | | | | | because the sql/stdsql option could not be specified. This has been solved by permitting the strgen to include the opton inside its name. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=195
| | * setup test environment and test code in order to look at...Rainer Gerhards2011-03-171-31/+14
| | | | | | | | | | | | | | | bug http://bugzilla.adiscon.com/show_bug.cgi?id=195 That bug currently prevents strgen's to be used with databases
| | * prepared skeleton for new strgen moduleRainer Gerhards2011-03-172-0/+144
| | |
| | * backporting patch for clean make distcheckRainer Gerhards2011-03-162-0/+11
| | |
* | | fixed double-free regerssion, probably caused by last mergeRainer Gerhards2011-03-141-5/+0
| | |
* | | fixed compile problem in imtemplateRainer Gerhards2011-03-141-1/+1
| | | | | | | | | | | | fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=235
* | | Merge branch 'v5-devel'Rainer Gerhards2011-03-145-10/+41
|\| | | | | | | | | | | | | | Conflicts: tests/diag.sh
| * | fixing cosmetic memory leak in imdiag, imfileRainer Gerhards2011-03-142-0/+11
| | | | | | | | | | | | | | | | | | This had no real consequences, as it happend exactly once during the runtime, so the OS cleaned up. However, it broke the valgrind testbench.
| * | Merge branch 'v5-beta' into v5-develRainer Gerhards2011-03-144-11/+25
| |\|
| | * fixed compile problem from epoll_create patchRainer Gerhards2011-03-141-1/+1
| | |
| | * Fall back to epoll_create() if epoll_create1() is not availableMichael Biebl2011-03-142-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | epoll_create1() was introduced in Linux kernel 2.6.27. If rsyslog was compiled on a newer kernel but run on a kernel older than 2.6.27, remote syslog fails. Apply a runtime check for epoll_create1() and fall back to epoll_create() in this case. Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=617996
| * | omhdfs: added some info on Java environment settingsRainer Gerhards2011-03-111-0/+14
| | |
* | | bugfix: very minor memory leak in imfileRainer Gerhards2011-03-111-0/+5
| | | | | | | | | | | | | | | almost cosmetic: leaks a few bytes once during a run -- more a problem for valgrind testing -- not for practical use
* | | Merge branch 'v5-devel'Rainer Gerhards2011-03-111-12/+73
|\| | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/omhdfs/omhdfs.c
| * | Merge branch 'v5-beta' into v5-develRainer Gerhards2011-03-091-1/+1
| |\ \ | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | enhanced omhdfs to support batching mode. This permits to increase performance,Rainer Gerhards2011-03-091-12/+73
| | | | | | | | | | | | | | | | | | | | as we now call the HDFS API with much larger message sizes and far more infrequently
* | | | Merge branch 'v5-beta'Rainer Gerhards2011-03-1138-9/+54
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/omlibdbi/omlibdbi.c tests/Makefile.am tests/diag.sh
| * | | bugfix: minor memory leak in omlibdbi (< 1k per instance and run)Rainer Gerhards2011-03-101-1/+8
| | | | | | | | | | | | | | | | | | | | also testbench improvement (omlibdbi now also receives a couple of tests if we have a life MySQL server).
| * | | bugfix: pmaixforwarded from fails to buildMichael Biebl2011-03-101-0/+1
| | |/ | |/| | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | Merge branch 'v5-stable' into v5-betaRainer Gerhards2011-03-091-1/+1
| |\ \ | | |/ | |/|
| | * Merge branch 'v4-stable' into tmpRainer Gerhards2011-03-091-1/+1
| | |\
| | | * bugfix: omlibdbi did not use password from rsyslog.conRainer Gerhards2011-03-091-1/+1
| | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=203
| * | | bugfix: (regression) omhdfs did no longer compileRainer Gerhards2011-03-091-0/+1
| | | |
| * | | forgot to backport imdiag mem leak fix -- now doneRainer Gerhards2011-03-061-0/+4
| | | |
| * | | fixed small regression from gnutls fd leak fixRainer Gerhards2011-03-063-0/+3
| | | |
| * | | Merge branch 'v5-beta-gtls-fix' into v5-betaRainer Gerhards2011-03-0631-0/+31
| |\ \ \
| | * | | added work-around for bug in gtls, which causes fd leak when using TLSBojan Smojver2011-02-2331-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | improved testbenchRainer Gerhards2011-03-011-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | - added valgrind-based test (the first one ever ;)) - fixed memory leak in imdiag (guess how this was detected...)
* | | | | Merge branch 'v5-beta'Rainer Gerhards2011-02-251-5/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | fixed compile problems on SolarisRainer Gerhards2011-02-231-0/+4
| |/ / /
| * | | the last fix introduced another regression, fixed nowRainer Gerhards2011-02-221-5/+8
| | | | | | | | | | | | | | | | | | | | The previous fix left variable lenMsg in an inconsistent state when sanitization actually happend. This could lead to message truncation.
| * | | bugfix: imuxsock does not sanitization at all (regression)Rainer Gerhards2011-02-221-4/+5
| | | | | | | | | | | | | | | | | | | | This also causes problems when NUL characters are present inside the message (as is the case with spamd).
| * | | fixed dumb but important typo in code...Rainer Gerhards2011-02-211-1/+1
| | | | | | | | | | | | | | | | thanks to Michael Biebl for alterting me
| * | | bugfix: imuxsock did no longer remove trailing LFRainer Gerhards2011-02-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a regression from the imuxsock partial rewrite. Happened because the message is no longer run through the standard parsers. Now imuxsock does this sanitization itself. bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=224
* | | | Merge branch 'v5-beta'Rainer Gerhards2011-02-181-0/+34
|\| | | | | | | | | | | | | | | | | | | Conflicts: plugins/imfile/imfile.c
| * | | enhance: imfile did not yet support multiple rulesets, now addedRainer Gerhards2011-02-181-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | we do this directly in the beta because a) it does not affect existing functionality and b) one may argue that this missing functionality is close to a bug.
* | | | Merge branch 'v5-beta'Rainer Gerhards2011-02-181-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/glbl.c tools/omdiscard.c
| * | | bugfix: very long running actions could prevent shutdown under some ↵Rainer Gerhards2011-02-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | circumstances This has now been solved, at least for common situations.
* | | | Merge branch 'v5-beta'Rainer Gerhards2011-02-115-54/+330
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | fixed some compile issues in recent systemd patchRainer Gerhards2011-02-111-2/+2
| | | |
| * | | Improved systemd socket activation supportMarius Tomaschewski2011-02-111-44/+45
| | | | | | | | | | | | | | | | | | | | | | | | Support for multiple unix sockets and activation in forking mode Signed-off-by: Marius Tomaschewski <mt@suse.de>
| * | | bugfix in pmsnareDavid Lang2011-02-111-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when removing text from the message, decrement the length when you increment the pointer through the message. there were a number of places where this was missed. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>