From e1c34e174139ad030ca1108ff9782b294909013c Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Tue, 19 Apr 2011 07:53:23 +0200 Subject: renamed conf.c to legacyconf.c to make room for new config system --- plugins/omuxsock/omuxsock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/omuxsock') diff --git a/plugins/omuxsock/omuxsock.c b/plugins/omuxsock/omuxsock.c index ea1c8014..8b9ec800 100644 --- a/plugins/omuxsock/omuxsock.c +++ b/plugins/omuxsock/omuxsock.c @@ -41,7 +41,7 @@ #include #include #include -#include "conf.h" +#include "legacyconf.h" #include "srUtils.h" #include "template.h" #include "msg.h" -- cgit From bbe1f2688c4bd5cb1b66bb48af1ce5428d69c3b9 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Tue, 19 Apr 2011 08:24:25 +0200 Subject: renaming conf.* wasn't a good idea -- undoing too many dependencies, things get cluttered (and merging probably gets problematic). Now new config will be "conf2". --- plugins/omuxsock/omuxsock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/omuxsock') 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 #include #include -#include "legacyconf.h" +#include "conf.h" #include "srUtils.h" #include "template.h" #include "msg.h" -- cgit From a7e3afb20b461f608f478e8fca15b02e67d6d9c3 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Wed, 20 Jul 2011 10:47:24 +0200 Subject: milestone: added module config names --- plugins/omuxsock/omuxsock.c | 1 + 1 file changed, 1 insertion(+) (limited to 'plugins/omuxsock') diff --git a/plugins/omuxsock/omuxsock.c b/plugins/omuxsock/omuxsock.c index ea1c8014..279f6820 100644 --- a/plugins/omuxsock/omuxsock.c +++ b/plugins/omuxsock/omuxsock.c @@ -53,6 +53,7 @@ MODULE_TYPE_OUTPUT MODULE_TYPE_NOKEEP +MODULE_CNFNAME("omuxsock") /* internal structures */ -- cgit From 535d6cf0b8fe2423eee3fd670bc1e944b231e827 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 19 Jan 2012 14:48:40 +0100 Subject: v6.1/2 scoping support removed from plugins --- plugins/omuxsock/omuxsock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins/omuxsock') diff --git a/plugins/omuxsock/omuxsock.c b/plugins/omuxsock/omuxsock.c index f6b18111..cf27c93c 100644 --- a/plugins/omuxsock/omuxsock.c +++ b/plugins/omuxsock/omuxsock.c @@ -69,8 +69,7 @@ typedef struct configSettings_s { uchar *tplName; /* name of the default template to use */ uchar *sockName; /* name of the default template to use */ } configSettings_t; - -SCOPING_SUPPORT; /* must be set AFTER configSettings_t is defined */ +static configSettings_t cs; BEGINinitConfVars /* (re)set config variables to default values */ CODESTARTinitConfVars @@ -307,6 +306,7 @@ static rsRetVal resetConfigVariables(uchar __attribute__((unused)) *pp, void __a BEGINmodInit() CODESTARTmodInit +INITLegCnfVars *ipIFVersProvided = CURR_MOD_IF_VERSION; /* we only support the current interface specification */ CODEmodInit_QueryRegCFSLineHdlr CHKiRet(objUse(glbl, CORE_COMPONENT)); -- cgit