summaryrefslogtreecommitdiffstats
path: root/tools/omfile.c
Commit message (Collapse)AuthorAgeFilesLines
* v6.1/2 scoping support removed from pluginsRainer Gerhards2012-01-191-3/+2
|
* Merge branch 'v6-stable-noscoping' into masterRainer Gerhards2012-01-191-18/+18
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imfile/imfile.c plugins/imklog/imklog.c plugins/immark/immark.c plugins/imptcp/imptcp.c plugins/imrelp/imrelp.c plugins/imtcp/imtcp.c plugins/imtemplate/imtemplate.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c plugins/mmsnmptrapd/mmsnmptrapd.c plugins/omtemplate/omtemplate.c runtime/glbl.c runtime/parser.c tools/omfile.c tools/syslogd.c
| * undoing v6.1 config scoping interface, part IRainer Gerhards2012-01-181-18/+18
| | | | | | | | The most common files are now changed, more needs to be done.
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-141-16/+16
| |\ | | | | | | | | | | | | Conflicts: plugins/imtcp/imtcp.c
| * \ Merge branch 'v5-stable' into betaRainer Gerhards2011-10-211-2/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * \ \ Merge branch 'v5-stable' into betaRainer Gerhards2011-09-261-8/+13
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * \ \ \ Merge branch 'v5-stable' into betaRainer Gerhards2011-07-111-1/+16
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h
* | \ \ \ \ Merge branch 'v5-stable' into masterRainer Gerhards2012-01-181-16/+16
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.h configure.ac doc/manual.html plugins/immark/immark.c plugins/impstats/impstats.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c runtime/cfsysline.c runtime/cfsysline.h runtime/conf.c runtime/ctok.c runtime/ctok.h runtime/ctok_token.c runtime/ctok_token.h runtime/dnscache.h runtime/expr.c runtime/expr.h runtime/rule.c runtime/rule.h runtime/ruleset.h runtime/sysvar.c runtime/vm.h runtime/vmop.c runtime/vmop.h runtime/vmprg.c runtime/vmprg.h runtime/vmstk.c runtime/vmstk.h tools/omusrmsg.c
| * | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-141-16/+16
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imfile/imfile.c plugins/omtesting/omtesting.c tcpsrv.c threads.c
| | * | | | more license analysis & changeRainer Gerhards2012-01-141-16/+16
| | | | | |
* | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-10-211-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-10-211-2/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h
| | * | | | | minor: slightly improved error reporting when dynafile open failsRainer Gerhards2011-10-201-2/+3
| | | |_|_|/ | | |/| | |
* | | | | | added support for v6 config system to omfwdRainer Gerhards2011-10-111-35/+1
| | | | | |
* | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-09-261-11/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/conf.c tools/omfile.c tools/omusrmsg.c
| * | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-09-261-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 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-221-5/+11
| | |\| | | | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-151-5/+34
| | | |\ \
| | | | * | issue a warning message for old-style dynafile actionRainer Gerhards2011-07-111-1/+8
| | | | | |
| | | | * | Merge branch 'v4-stable' into v4-develRainer Gerhards2011-07-111-1/+9
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | | | * \ \ Merge branch 'v4-stable' into v4-develRainer Gerhards2010-12-161-1/+0
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/parser.c
| | | | * | | | minor cleanupRainer Gerhards2010-04-191-2/+2
| | | | | | | |
| | | * | | | | typo fixAndrew Stothard2011-09-151-1/+1
| | | | |_|/ / | | | |/| | |
* | | | | | | regression: omfile aborted on dynafiles (never released bug)Rainer Gerhards2011-08-011-4/+3
| | | | | | |
* | | | | | | omusrmsg now supports the new config systemRainer Gerhards2011-07-211-1/+0
| | | | | | |
* | | | | | | milestone: omfile basically gets its parameters via the new systemRainer Gerhards2011-07-211-47/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | but not all syntax handlers are present (so it does not yet fully work).
* | | | | | | milestone: new output plugin interface call addedRainer Gerhards2011-07-211-0/+2
| | | | | | |
* | | | | | | milestone: on the way to a new action conf interface to plugins...Rainer Gerhards2011-07-201-0/+81
| | | | | | |
* | | | | | | cleanupRainer Gerhards2011-07-201-21/+1
| | | | | | |
* | | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-07-111-1/+16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h
| * | | | | | Merge branch 'v5-stable' into v5-develRainer 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
| | | | |/ / | | | |/| |
| * | | | | bugfix: error state not correctly set for gone-away config directiveRainer Gerhards2011-06-101-0/+1
| | | | | |
* | | | | | Merge branch 'beta'Rainer Gerhards2011-06-211-5/+5
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/Makefile.am tests/manytcp-too-few-tls.sh
| * | | | | bugfix: $ActionFileDefaultTemplate did not workRainer Gerhards2011-06-021-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=262
* | | | | | merge fix: made mistake when merging in v5-devel changes, now fixingRainer Gerhards2011-04-271-13/+1
| | | | | |
* | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-04-261-24/+9
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | Conflicts: tools/omfile.c
| * | | | | bugfix: do not open files with full privileges, if privs will be droppedRainer Gerhards2011-04-261-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...).
* | | | | renaming conf.* wasn't a good idea -- undoingRainer Gerhards2011-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | too many dependencies, things get cluttered (and merging probably gets problematic). Now new config will be "conf2".
* | | | | renamed conf.c to legacyconf.c to make room for new config systemRainer Gerhards2011-04-191-1/+1
| |/ / / |/| | |
* | | | Merge branch 'v5-beta'Rainer Gerhards2011-03-111-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/omlibdbi/omlibdbi.c tests/Makefile.am tests/diag.sh
| * | | added work-around for bug in gtls, which causes fd leak when using TLSBojan Smojver2011-02-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge branch 'v5-devel'Rainer Gerhards2010-12-171-1/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c plugins/imudp/imudp.c runtime/glbl.c
| * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2010-12-161-1/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/parser.c runtime/queue.c runtime/wtp.c template.c threads.c tools/syslogd.c
| | * | some cleanup based on clang static analyzer resultsRainer Gerhards2010-12-161-1/+0
| | | |
* | | | Merge branch 'v5-devel'Rainer Gerhards2010-11-251-1/+5
|\| | | | | | | | | | | | | | | | | | | Conflicts: runtime/rsyslog.h
generated by cgit (git 2.34.1) at 2024-06-12 00:13:44 +0000