summaryrefslogtreecommitdiffstats
path: root/runtime/cfsysline.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v5-devel'Rainer Gerhards2012-04-071-31/+38
|\ | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c
| * permit size modifiers (k,m,g,...) in integer config parametersRainer Gerhards2012-04-071-31/+38
| | | | | | | | Thanks to Jo Rhett for the suggestion.
* | refactor: removing v6.1 scoping codeRainer Gerhards2012-01-191-19/+11
| |
* | Merge branch 'v6-stable-noscoping' into masterRainer Gerhards2012-01-191-10/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-10/+6
| | | | | | | | | | | | The most common files are now changed, more needs to be done.
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-181-16/+14
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imptcp/imptcp.c
* | | Merge branch 'v5-stable' into masterRainer Gerhards2012-01-181-16/+14
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-161-16/+14
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/debug.h runtime/obj.c runtime/parser.h runtime/wti.h
| | * | license changesRainer Gerhards2012-01-161-16/+14
| | | |
| | * | added $LocalHostName config directive & some bugfixingRainer Gerhards2010-12-161-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | - added $LocalHostName config directive - bugfix: local hostname was pulled too-early, so that some config directives (namely FQDN settings) did not have any effect
| | * | Merge branch 'v4-stable' into v4-develRainer Gerhards2010-12-161-2/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/parser.c
| * | | | backporting patch for clean make distcheckRainer Gerhards2011-03-161-0/+3
| | | | |
* | | | | milestone: all syntaxes for new config handler implementedRainer Gerhards2011-07-221-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so far, mostly compile-time tested. Real testing happens as side-activity when implementing other parts of the new config system
* | | | | step: config handler setting from syslogd.c moved to rsconf.cRainer Gerhards2011-04-211-1/+3
| | | | |
* | | | | step: slowly migrating config settings... ;)Rainer Gerhards2011-04-191-0/+10
| | | | |
* | | | | 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-devel'Rainer Gerhards2011-03-141-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: tests/diag.sh
| * | | | fixing cosmetic memory leak in imdiag, imfileRainer Gerhards2011-03-141-0/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | 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-devel'Rainer Gerhards2010-12-171-5/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c plugins/imudp/imudp.c runtime/glbl.c
| * | | bugfix: batch processing flagged invalid message as "bad" under some ↵Rainer Gerhards2010-12-161-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | circumstances also fixed some cosmetic nits
| * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2010-12-161-2/+2
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | | | | | | | | | | | | | 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-2/+2
| | |
| | * fixing some compile problems on FreeBSDRainer Gerhards2010-10-191-3/+3
| | |
* | | first shot at scoping (for actions only)Rainer Gerhards2010-07-231-11/+25
| | | | | | | | | | | | | | | parser now supports $Begin action, $End action, $StrictScoping, but not yet the actual semantics.
* | | moving towards scoping inside rsyslog.confRainer Gerhards2010-07-211-6/+9
|/ / | | | | | | first step: adding object-type specifier to config statement table
* / bugfix: the T/P/E config size specifiers did not work properly under call ↵Rainer Gerhards2010-04-071-3/+5
|/ | | | 32-bit platforms
* Merge branch 'master' into omfileRainer Gerhards2009-06-161-6/+6
|\ | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/msg.h tcps_sess.c tcpsrv.c tools/syslogd.c
| * done various optimizations to the stringbuf and its usersRainer Gerhards2009-06-161-6/+6
| |
* | completed multi-ruleset core supportRainer Gerhards2009-06-121-3/+3
|/ | | | ... as well as added multi-ruleset support for imtcp
* clean compile on solarisRainer Gerhards2009-04-021-2/+2
|
* Merge branch 'v3-stable' into betaRainer Gerhards2008-09-021-5/+5
| | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
* added (internal) error codes to error messagesRainer Gerhards2008-06-271-10/+10
| | | | | Also added redirector to web description of error codes closes bug http://bugzilla.adiscon.com/show_bug.cgi?id=20
* Merge branch 'beta'Rainer Gerhards2008-05-161-0/+2
| | | | | | | Conflicts: ChangeLog rfc3195d.c
* Merge branch 'beta'Rainer Gerhards2008-05-021-1/+3
| | | | | | | | | | Conflicts: plugins/imklog/linux.c runtime/cfsysline.c runtime/ctok.c runtime/linkedlist.c runtime/sysvar.c
* added missing copyright statementsRainer Gerhards2008-04-241-0/+2
| | | | (thanks to Michael Biebl for noticing)
* completed better modularity of runtimeRainer Gerhards2008-04-171-1/+0
| | | | | | | | | | - added the ability to specify an error log function for the runtime - removed dependency of core runtime on dirty.h Note that it is "better" modularity, not perfect. There is still work to do, but I think we can for the time being proceed with other things.
* modularization workRainer Gerhards2008-04-171-0/+991
cleanup + created an abstract class for global data items and moved glblGetWorkDir to it
generated by cgit (git 2.34.1) at 2024-11-16 04:10:00 +0000