diff options
42 files changed, 45 insertions, 45 deletions
diff --git a/plugins/mmnormalize/mmnormalize.c b/plugins/mmnormalize/mmnormalize.c index 9517ec09..9c23afde 100644 --- a/plugins/mmnormalize/mmnormalize.c +++ b/plugins/mmnormalize/mmnormalize.c @@ -38,7 +38,7 @@ #include <libestr.h> #include <libee/libee.h> #include <liblognorm.h> -#include "legacyconf.h" +#include "conf.h" #include "syslogd-types.h" #include "template.h" #include "module-template.h" diff --git a/plugins/omdbalerting/omdbalerting.c b/plugins/omdbalerting/omdbalerting.c index 55e8c375..35de5818 100644 --- a/plugins/omdbalerting/omdbalerting.c +++ b/plugins/omdbalerting/omdbalerting.c @@ -35,7 +35,7 @@ #include <signal.h> #include <errno.h> #include <unistd.h> -#include "legacyconf.h" +#include "conf.h" #include "syslogd-types.h" #include "srUtils.h" #include "template.h" diff --git a/plugins/omgssapi/omgssapi.c b/plugins/omgssapi/omgssapi.c index 1dc96794..6b75540f 100644 --- a/plugins/omgssapi/omgssapi.c +++ b/plugins/omgssapi/omgssapi.c @@ -44,7 +44,7 @@ #include <pthread.h> #include <gssapi/gssapi.h> #include "dirty.h" -#include "legacyconf.h" +#include "conf.h" #include "syslogd-types.h" #include "srUtils.h" #include "net.h" diff --git a/plugins/omhdfs/omhdfs.c b/plugins/omhdfs/omhdfs.c index efd3b672..48168f28 100644 --- a/plugins/omhdfs/omhdfs.c +++ b/plugins/omhdfs/omhdfs.c @@ -41,7 +41,7 @@ #include "syslogd-types.h" #include "srUtils.h" #include "template.h" -#include "legacyconf.h" +#include "conf.h" #include "cfsysline.h" #include "module-template.h" #include "unicode-helper.h" diff --git a/plugins/ommail/ommail.c b/plugins/ommail/ommail.c index fbf6bfad..6468dcf2 100644 --- a/plugins/ommail/ommail.c +++ b/plugins/ommail/ommail.c @@ -44,7 +44,7 @@ #include <netdb.h> #include <time.h> #include <sys/socket.h> -#include "legacyconf.h" +#include "conf.h" #include "syslogd-types.h" #include "srUtils.h" #include "cfsysline.h" diff --git a/plugins/ommongodb/ommongodb.c b/plugins/ommongodb/ommongodb.c index 3b7e9209..8e19105f 100644 --- a/plugins/ommongodb/ommongodb.c +++ b/plugins/ommongodb/ommongodb.c @@ -10,7 +10,7 @@ #include "mongo.h" #include "config.h" #include "rsyslog.h" -#include "legacyconf.h" +#include "conf.h" #include "syslogd-types.h" #include "srUtils.h" #include "template.h" @@ -277,4 +277,4 @@ CODEmodInit_QueryRegCFSLineHdlr INITChkCoreFeature(bCoreSupportsBatching, CORE_FEATURE_BATCHING); DBGPRINTF("ompgsql: module compiled with rsyslog version %s.\n", VERSION); DBGPRINTF("ompgsql: %susing transactional output interface.\n", bCoreSupportsBatching ? "" : "not "); -ENDmodInit +ENDmodInit
\ No newline at end of file diff --git a/plugins/ommysql/ommysql.c b/plugins/ommysql/ommysql.c index 90120768..978f3517 100644 --- a/plugins/ommysql/ommysql.c +++ b/plugins/ommysql/ommysql.c @@ -36,7 +36,7 @@ #include <errno.h> #include <time.h> #include <mysql.h> -#include "legacyconf.h" +#include "conf.h" #include "syslogd-types.h" #include "srUtils.h" #include "template.h" diff --git a/plugins/ompgsql/ompgsql.c b/plugins/ompgsql/ompgsql.c index 373bfb6d..df9cc3fe 100644 --- a/plugins/ompgsql/ompgsql.c +++ b/plugins/ompgsql/ompgsql.c @@ -40,7 +40,7 @@ #include <errno.h> #include <time.h> #include <libpq-fe.h> -#include "legacyconf.h" +#include "conf.h" #include "syslogd-types.h" #include "srUtils.h" #include "template.h" diff --git a/plugins/omprog/omprog.c b/plugins/omprog/omprog.c index 05cb0803..81098257 100644 --- a/plugins/omprog/omprog.c +++ b/plugins/omprog/omprog.c @@ -36,7 +36,7 @@ #include <errno.h> #include <unistd.h> #include <wait.h> -#include "legacyconf.h" +#include "conf.h" #include "syslogd-types.h" #include "srUtils.h" #include "template.h" diff --git a/plugins/omrelp/omrelp.c b/plugins/omrelp/omrelp.c index 4e8f5419..26e8ccd3 100644 --- a/plugins/omrelp/omrelp.c +++ b/plugins/omrelp/omrelp.c @@ -36,7 +36,7 @@ #include <errno.h> #include <ctype.h> #include <librelp.h> -#include "legacyconf.h" +#include "conf.h" #include "syslogd-types.h" #include "srUtils.h" #include "cfsysline.h" diff --git a/plugins/omruleset/omruleset.c b/plugins/omruleset/omruleset.c index e41b8445..365b405d 100644 --- a/plugins/omruleset/omruleset.c +++ b/plugins/omruleset/omruleset.c @@ -39,7 +39,7 @@ #include <signal.h> #include <errno.h> #include <unistd.h> -#include "legacyconf.h" +#include "conf.h" #include "syslogd-types.h" #include "template.h" #include "module-template.h" diff --git a/plugins/omsnmp/omsnmp.c b/plugins/omsnmp/omsnmp.c index 4b928c03..777a8074 100644 --- a/plugins/omsnmp/omsnmp.c +++ b/plugins/omsnmp/omsnmp.c @@ -36,7 +36,7 @@ #include <netdb.h> #include <ctype.h> #include <assert.h> -#include "legacyconf.h" +#include "conf.h" #include "syslogd-types.h" #include "cfsysline.h" #include "module-template.h" diff --git a/plugins/omstdout/omstdout.c b/plugins/omstdout/omstdout.c index 55d25fe5..f57cbe57 100644 --- a/plugins/omstdout/omstdout.c +++ b/plugins/omstdout/omstdout.c @@ -35,7 +35,7 @@ #include <signal.h> #include <errno.h> #include <unistd.h> -#include "legacyconf.h" +#include "conf.h" #include "syslogd-types.h" #include "srUtils.h" #include "template.h" diff --git a/plugins/omtemplate/omtemplate.c b/plugins/omtemplate/omtemplate.c index c6dd9546..238ec0ae 100644 --- a/plugins/omtemplate/omtemplate.c +++ b/plugins/omtemplate/omtemplate.c @@ -36,7 +36,7 @@ #include <signal.h> #include <errno.h> #include <time.h> -#include "legacyconf.h" +#include "conf.h" #include "syslogd-types.h" #include "srUtils.h" #include "template.h" diff --git a/plugins/omtesting/omtesting.c b/plugins/omtesting/omtesting.c index 15987077..414ecfc5 100644 --- a/plugins/omtesting/omtesting.c +++ b/plugins/omtesting/omtesting.c @@ -53,7 +53,7 @@ #include "dirty.h" #include "syslogd-types.h" #include "module-template.h" -#include "legacyconf.h" +#include "conf.h" #include "cfsysline.h" MODULE_TYPE_OUTPUT diff --git a/plugins/omudpspoof/omudpspoof.c b/plugins/omudpspoof/omudpspoof.c index 19e0b70a..217de1c8 100644 --- a/plugins/omudpspoof/omudpspoof.c +++ b/plugins/omudpspoof/omudpspoof.c @@ -60,7 +60,7 @@ #ifdef USE_NETZIP #include <zlib.h> #endif -#include "legacyconf.h" +#include "conf.h" #include "syslogd-types.h" #include "srUtils.h" #include "net.h" diff --git a/plugins/omuxsock/omuxsock.c b/plugins/omuxsock/omuxsock.c index 8b9ec800..ea1c8014 100644 --- a/plugins/omuxsock/omuxsock.c +++ b/plugins/omuxsock/omuxsock.c @@ -41,7 +41,7 @@ #include <assert.h> #include <errno.h> #include <unistd.h> -#include "legacyconf.h" +#include "conf.h" #include "srUtils.h" #include "template.h" #include "msg.h" diff --git a/plugins/pmaixforwardedfrom/pmaixforwardedfrom.c b/plugins/pmaixforwardedfrom/pmaixforwardedfrom.c index 12c52ff9..fa4a9087 100644 --- a/plugins/pmaixforwardedfrom/pmaixforwardedfrom.c +++ b/plugins/pmaixforwardedfrom/pmaixforwardedfrom.c @@ -29,7 +29,7 @@ #include <string.h> #include <assert.h> #include <ctype.h> -#include "legacyconf.h" +#include "conf.h" #include "syslogd-types.h" #include "template.h" #include "msg.h" diff --git a/plugins/pmcisconames/pmcisconames.c b/plugins/pmcisconames/pmcisconames.c index bf79e957..61688cbf 100644 --- a/plugins/pmcisconames/pmcisconames.c +++ b/plugins/pmcisconames/pmcisconames.c @@ -29,7 +29,7 @@ #include <string.h> #include <assert.h> #include <ctype.h> -#include "legacyconf.h" +#include "conf.h" #include "syslogd-types.h" #include "template.h" #include "msg.h" diff --git a/plugins/pmlastmsg/pmlastmsg.c b/plugins/pmlastmsg/pmlastmsg.c index 118c4331..259c5d41 100644 --- a/plugins/pmlastmsg/pmlastmsg.c +++ b/plugins/pmlastmsg/pmlastmsg.c @@ -35,7 +35,7 @@ #include <string.h> #include <assert.h> #include <ctype.h> -#include "legacyconf.h" +#include "conf.h" #include "syslogd-types.h" #include "template.h" #include "msg.h" diff --git a/plugins/pmrfc3164sd/pmrfc3164sd.c b/plugins/pmrfc3164sd/pmrfc3164sd.c index 4ddd98bc..53204ece 100644 --- a/plugins/pmrfc3164sd/pmrfc3164sd.c +++ b/plugins/pmrfc3164sd/pmrfc3164sd.c @@ -33,7 +33,7 @@ #include <errno.h> #include <ctype.h> #include "syslogd.h" -#include "legacyconf.h" +#include "conf.h" #include "syslogd-types.h" #include "template.h" #include "msg.h" diff --git a/plugins/pmsnare/pmsnare.c b/plugins/pmsnare/pmsnare.c index 757e6a8f..f3658d11 100644 --- a/plugins/pmsnare/pmsnare.c +++ b/plugins/pmsnare/pmsnare.c @@ -46,7 +46,7 @@ #include <string.h> #include <assert.h> #include <ctype.h> -#include "legacyconf.h" +#include "conf.h" #include "syslogd-types.h" #include "template.h" #include "msg.h" diff --git a/plugins/sm_cust_bindcdr/sm_cust_bindcdr.c b/plugins/sm_cust_bindcdr/sm_cust_bindcdr.c index b55cec48..0fa1a4c4 100644 --- a/plugins/sm_cust_bindcdr/sm_cust_bindcdr.c +++ b/plugins/sm_cust_bindcdr/sm_cust_bindcdr.c @@ -41,7 +41,7 @@ #include <string.h> #include <assert.h> #include <errno.h> -#include "legacyconf.h" +#include "conf.h" #include "syslogd-types.h" #include "cfsysline.h" #include "template.h" diff --git a/runtime/Makefile.am b/runtime/Makefile.am index a963251c..c8e8ce2a 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -18,8 +18,8 @@ librsyslog_la_SOURCES = \ glbl.h \ glbl.c \ unlimited_select.h \ - legacyconf.c \ - legacyconf.h \ + conf.c \ + conf.h \ parser.h \ parser.c \ strgen.h \ diff --git a/runtime/cfsysline.c b/runtime/cfsysline.c index 44b26022..97b35bb2 100644 --- a/runtime/cfsysline.c +++ b/runtime/cfsysline.c @@ -39,7 +39,7 @@ #include "cfsysline.h" #include "obj.h" -#include "legacyconf.h" +#include "conf.h" #include "errmsg.h" #include "srUtils.h" #include "unicode-helper.h" diff --git a/runtime/legacyconf.c b/runtime/conf.c index fd23bdcd..1d28a884 100644 --- a/runtime/legacyconf.c +++ b/runtime/conf.c @@ -1,4 +1,4 @@ -/* The legacy config file handler (not yet a real object) +/* The config file handler (not yet a real object) * * This file is based on an excerpt from syslogd.c, which dates back * much later. I began the file on 2008-02-19 as part of the modularization @@ -60,7 +60,7 @@ #include "modules.h" #include "outchannel.h" #include "stringbuf.h" -#include "legacyconf.h" +#include "conf.h" #include "stringbuf.h" #include "srUtils.h" #include "errmsg.h" diff --git a/runtime/legacyconf.h b/runtime/conf.h index 2cfd540f..bc09d502 100644 --- a/runtime/legacyconf.h +++ b/runtime/conf.h @@ -1,4 +1,4 @@ -/* Definitions for the legacy config file handling (not yet an object). +/* Definitions for config file handling (not yet an object). * * Copyright 2008 Rainer Gerhards and Adiscon GmbH. * diff --git a/runtime/rsyslog.c b/runtime/rsyslog.c index 9cf32f22..bdb1c9ff 100644 --- a/runtime/rsyslog.c +++ b/runtime/rsyslog.c @@ -74,7 +74,7 @@ #include "vmprg.h" #include "datetime.h" #include "queue.h" -#include "legacyconf.h" +#include "conf.h" #include "glbl.h" #include "errmsg.h" #include "prop.h" diff --git a/runtime/strmsrv.c b/runtime/strmsrv.c index 4de58b77..e66ad717 100644 --- a/runtime/strmsrv.c +++ b/runtime/strmsrv.c @@ -64,7 +64,7 @@ #include "module-template.h" #include "net.h" #include "srUtils.h" -#include "legacyconf.h" +#include "conf.h" #include "strmsrv.h" #include "obj.h" #include "glbl.h" @@ -59,7 +59,7 @@ #include "module-template.h" #include "net.h" #include "srUtils.h" -#include "legacyconf.h" +#include "conf.h" #include "tcpsrv.h" #include "obj.h" #include "glbl.h" diff --git a/tools/omfile.c b/tools/omfile.c index 5fc87330..8526cb74 100644 --- a/tools/omfile.c +++ b/tools/omfile.c @@ -56,7 +56,7 @@ #endif -#include "legacyconf.h" +#include "conf.h" #include "syslogd-types.h" #include "srUtils.h" #include "template.h" diff --git a/tools/omfwd.c b/tools/omfwd.c index 3004b082..be13bf75 100644 --- a/tools/omfwd.c +++ b/tools/omfwd.c @@ -48,7 +48,7 @@ #endif #include <pthread.h> #include "syslogd.h" -#include "legacyconf.h" +#include "conf.h" #include "syslogd-types.h" #include "srUtils.h" #include "net.h" diff --git a/tools/ompipe.c b/tools/ompipe.c index db4de73b..01695369 100644 --- a/tools/ompipe.c +++ b/tools/ompipe.c @@ -53,7 +53,7 @@ #include "omfile.h" /* for dirty trick: access to $ActionFileDefaultTemplate value */ #include "cfsysline.h" #include "module-template.h" -#include "legacyconf.h" +#include "conf.h" #include "errmsg.h" MODULE_TYPE_OUTPUT diff --git a/tools/omshell.c b/tools/omshell.c index 046fb41d..0e4e0f24 100644 --- a/tools/omshell.c +++ b/tools/omshell.c @@ -38,7 +38,7 @@ #include <stdlib.h> #include <string.h> #include <assert.h> -#include "legacyconf.h" +#include "conf.h" #include "syslogd-types.h" #include "srUtils.h" #include "omshell.h" diff --git a/tools/omusrmsg.c b/tools/omusrmsg.c index e5477a1c..da510e08 100644 --- a/tools/omusrmsg.c +++ b/tools/omusrmsg.c @@ -74,7 +74,7 @@ #include "srUtils.h" #include "stringbuf.h" #include "syslogd-types.h" -#include "legacyconf.h" +#include "conf.h" #include "omusrmsg.h" #include "module-template.h" #include "errmsg.h" diff --git a/tools/pmrfc3164.c b/tools/pmrfc3164.c index 3876ca0b..635ca985 100644 --- a/tools/pmrfc3164.c +++ b/tools/pmrfc3164.c @@ -33,7 +33,7 @@ #include <errno.h> #include <ctype.h> #include "syslogd.h" -#include "legacyconf.h" +#include "conf.h" #include "syslogd-types.h" #include "template.h" #include "msg.h" diff --git a/tools/pmrfc5424.c b/tools/pmrfc5424.c index d39ec8e5..b06f1347 100644 --- a/tools/pmrfc5424.c +++ b/tools/pmrfc5424.c @@ -32,7 +32,7 @@ #include <assert.h> #include <errno.h> #include "syslogd.h" -#include "legacyconf.h" +#include "conf.h" #include "syslogd-types.h" #include "template.h" #include "msg.h" diff --git a/tools/smfile.c b/tools/smfile.c index c8f66120..1e0bf091 100644 --- a/tools/smfile.c +++ b/tools/smfile.c @@ -38,7 +38,7 @@ #include <assert.h> #include <errno.h> #include "syslogd.h" -#include "legacyconf.h" +#include "conf.h" #include "syslogd-types.h" #include "template.h" #include "msg.h" diff --git a/tools/smfwd.c b/tools/smfwd.c index 3f9a3a84..60fe94a7 100644 --- a/tools/smfwd.c +++ b/tools/smfwd.c @@ -35,7 +35,7 @@ #include <assert.h> #include <errno.h> #include "syslogd.h" -#include "legacyconf.h" +#include "conf.h" #include "syslogd-types.h" #include "template.h" #include "msg.h" diff --git a/tools/smtradfile.c b/tools/smtradfile.c index e57d2937..5484f7be 100644 --- a/tools/smtradfile.c +++ b/tools/smtradfile.c @@ -35,7 +35,7 @@ #include <assert.h> #include <errno.h> #include "syslogd.h" -#include "legacyconf.h" +#include "conf.h" #include "syslogd-types.h" #include "template.h" #include "msg.h" diff --git a/tools/smtradfwd.c b/tools/smtradfwd.c index be3982d7..37717434 100644 --- a/tools/smtradfwd.c +++ b/tools/smtradfwd.c @@ -35,7 +35,7 @@ #include <assert.h> #include <errno.h> #include "syslogd.h" -#include "legacyconf.h" +#include "conf.h" #include "syslogd-types.h" #include "template.h" #include "msg.h" diff --git a/tools/syslogd.c b/tools/syslogd.c index a6127305..44c88624 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -124,7 +124,7 @@ #include "wti.h" #include "queue.h" #include "stream.h" -#include "legacyconf.h" +#include "conf.h" #include "errmsg.h" #include "datetime.h" #include "parser.h" |