summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | Merge branch 'beta' of git+ssh://git.adiscon.com/git/rsyslog into betaAndre Lorbach2012-06-280-0/+0
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'v6-stable' into betaCharlie Root2012-06-281-1/+1
| | | |\ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ Merge branch 'v6-stable' into betaAndre Lorbach2012-06-281-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| / / / / / / / | | | |/ / / / / / /
| * | / / / / / / / imklog: cleanup of no longer used codeRainer Gerhards2012-06-292-32/+0
| |/ / / / / / / /
| * | | | | | | | cleanup: remove config scoping system left-overRainer Gerhards2012-06-272-30/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this was an experiment in early v6 that did not work out. I forgot to remove this code when I undid it.
| * | | | | | | | improve invalid config command error messageRainer Gerhards2012-06-271-1/+2
| | | | | | | | |
| * | | | | | | | bugfix: $ActionName was not properly honoredRainer Gerhards2012-06-272-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Abby Edwards for alerting us.
| * | | | | | | | preparing for 6.3.11v6.3.11Rainer Gerhards2012-06-183-3/+3
| | | | | | | | |
| * | | | | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-06-152-12/+7
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/omudpspoof/omudpspoof.c tools/syslogd.c
| * | | | | | | | | bugfix: small memory leak in imptcp (static after config read)Rainer Gerhards2012-06-141-1/+2
| | | | | | | | | |
| * | | | | | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-06-1413-1/+1552
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | | | | | | | adding pkgconfigdir definition to Makefile.am to help build properlyAbby Edwards2012-06-131-0/+2
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-06-112-4/+38
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | | | | | | | | bugfix: expression-based filters with AND/OR could segfaultRainer Gerhards2012-06-112-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | due to a problem with boolean shortcut operations. From the user's perspective, the segfault is almost non-deterministic (it occurs when a shortcut is used). Thanks to Lars Peterson for providing the initial bug report and his support in solving it.
| * | | | | | | | | | | Merge branch 'v5-beta' into betaRainer Gerhards2012-06-067-34/+62
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/modules.c
| | * | | | | | | | | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-067-34/+62
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/modules.c
| * | | | | | | | | | | | Remove obsolete ommongodb build instructionsMiloslav Trmač2012-06-051-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The plugin now uses libmongo-client (which is configured using pkg-config) instead of the 10gen client, so the instructions to copy client source code no longer apply.
| * | | | | | | | | | | | regression fix: last memleak bugfix caused abort in some situationsRainer Gerhards2012-06-051-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was introduced by the fix I did roughly an hour ago. Obviously, no released version is affected.
| * | | | | | | | | | | | restructured cfsysline handling a bitRainer Gerhards2012-06-051-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so that we have cleaner code
| * | | | | | | | | | | | fixing small memleak during config read phaseRainer Gerhards2012-06-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | traditional system line buffers were not freed. semi-static memory leak during config load phase, did not grow while processing messages. Usually less than 5k during the whole runtime.
| * | | | | | | | | | | | bugfix: made rsyslog compile when libestr ist not installed in /usrv6.3.10Rainer Gerhards2012-06-042-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Miloslav Trmač for providing patches and suggestions
| * | | | | | | | | | | | cosmetic: removed autoconf warning messagesRainer Gerhards2012-06-041-4/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | preparing for 6.3.10Rainer Gerhards2012-06-043-3/+13
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-06-042-7/+10
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v6-stable' into betaRainer Gerhards2012-06-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v5-beta' into betaRainer Gerhards2012-06-014-13/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | doc: mentioning imported bugfix in ChangeLogRainer Gerhards2012-06-011-0/+7
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-014-13/+26
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/queue.c
| * | | | | | | | | | | | | | | Skip tests that require root if euid != 0Miloslav Trmač2012-05-314-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will mark them as SKIPPED instead of FAILED, making it at least in theory possible to get 0 FAILED tests even when running as an unprivileged user.
| * | | | | | | | | | | | | | | Don't run valgrind tests if imdiag is not enabledMiloslav Trmač2012-05-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Valgrind tests depend on imdiag as well.
| * | | | | | | | | | | | | | | Add ylwrap to .gitignoreMiloslav Trmač2012-05-311-0/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | bugfix: invalid free in imptcp could lead to abort during startupRainer Gerhards2012-05-292-0/+3
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'v5-beta' into betaRainer Gerhards2012-05-295-4/+57
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | | | | | | | | | | | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-05-295-3/+27
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-05-101-0/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | | | | | | | | | | | | | | bugfix: disk queue was not persisted on shutdown, regression of fix toRainer Gerhards2012-05-102-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://bugzilla.adiscon.com/show_bug.cgi?id=299 The new code also handles the case of shutdown of blocking light and full delayable sources somewhat smarter and permits, assuming sufficient timouts, to persist message up to the max queue capacity. Also some nits debug instrumentation have been fixed.
| * | | | | | | | | | | | | | | | | preparing for 6.3.9 (beta) releasev6.3.9Rainer Gerhards2012-05-223-3/+3
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | tcpsrv: cleaned up patch, works now with multiple users as wellRainer Gerhards2012-05-181-7/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: "users" means modules, like imtcp and imdiag. NOT real users or devices.
| * | | | | | | | | | | | | | | | | regression: tcpsrv.c always activated first worker, what lead to hangRainer Gerhards2012-05-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... if more than 3 fds were to be read at the same time.
| * | | | | | | | | | | | | | | | | bugfix: imtcp could cause hang during receptionRainer Gerhards2012-05-162-12/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this also applied to other users of core file tcpsrv.c, but imtcp was by far the most prominent and widely-used, the rest rather exotic (like imdiag) NOTE: this patch is probably not 100% correct and may cause problems if multiple tcpsrv.c users existing within a configuration. The next step is to evaluate this and probably slightly change the worker thread startup/shutdown location.
| * | | | | | | | | | | | | | | | | minor issue: tcpsrv did not decrement wrkr cnt on shutdownRainer Gerhards2012-05-151-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I am not really sure if that is an issue at all, at least it is inconsistent.
| * | | | | | | | | | | | | | | | | Merge branch 'v6-stable'Rainer Gerhards2012-05-102-12/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v5-beta'Rainer Gerhards2012-05-103-15/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | | | | | | | | | | | | | | | | Merge branch 'v5-beta' of git+ssh://git.adiscon.com/git/rsyslog into v5-betaRainer Gerhards2012-05-103-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | preparing for 5.9.7v5.9.7Rainer Gerhards2012-05-103-3/+3
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-05-103-15/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | | | | | | | | | | | | | | | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-05-035-9/+110
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | | | | | | | | | | | | | | | | | | cosmetic: new version in ChangeLogRainer Gerhards2012-04-271-0/+2
| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge branch 'v5-stable-field-substring' into v5-betaRainer Gerhards2012-04-276-73/+107
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | added capability to specify substrings for field extraction modeRainer Gerhards2012-04-275-63/+97
| | | | | | | | | | | | | | | | | | | | | |