summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-03-07 19:00:51 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2013-03-07 19:00:51 +0100
commit212d4e4fe684a4562b284c5b07d9873b0135b10f (patch)
tree44a0dbc9a29fed3523e160eb174bbde0d332898c /tools
parent85dd75a54cc9032fce7553f284618cfbbf8508ef (diff)
downloadrsyslog-212d4e4fe684a4562b284c5b07d9873b0135b10f.tar.gz
rsyslog-212d4e4fe684a4562b284c5b07d9873b0135b10f.tar.bz2
rsyslog-212d4e4fe684a4562b284c5b07d9873b0135b10f.zip
logsig: add config parameters (for omfile)
Diffstat (limited to 'tools')
-rw-r--r--tools/Makefile.am9
-rw-r--r--tools/omfile.c5
2 files changed, 8 insertions, 6 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am
index ecdce8ea..8af86cb4 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -59,10 +59,11 @@ logctl_CPPFLAGS = $(LIBMONGO_CLIENT_CFLAGS)
logctl_LDADD = $(LIBMONGO_CLIENT_LIBS)
endif
if ENABLE_GUARDTIME
-bin_PROGRAMS += logsigner rsgttlvdump
-logsigner = logsigner.c
-logsigner_CPPFLAGS = $(RSRT_CFLAGS) $(GUARDTIME_CFLAGS)
-logsigner_LDADD = ../runtime/librsgt.la $(GUARDTIME_LIBS)
+bin_PROGRAMS += rsgttlvdump
+#bin_PROGRAMS += logsigner rsgttlvdump
+#logsigner = logsigner.c
+#logsigner_CPPFLAGS = $(RSRT_CFLAGS) $(GUARDTIME_CFLAGS)
+#logsigner_LDADD = ../runtime/librsgt.la $(GUARDTIME_LIBS)
rsgttlvdump = rsgttlvdump.c
rsgttlvdump_CPPFLAGS = $(RSRT_CFLAGS) $(GUARDTIME_CFLAGS)
rsgttlvdump_LDADD = ../runtime/librsgt.la $(GUARDTIME_LIBS)
diff --git a/tools/omfile.c b/tools/omfile.c
index efdf5e5b..e439d504 100644
--- a/tools/omfile.c
+++ b/tools/omfile.c
@@ -989,7 +989,7 @@ finalize_it:
}
static inline void
-initSigprov(instanceData *pData)
+initSigprov(instanceData *pData, struct nvlst *lst)
{
uchar szDrvrName[1024];
@@ -1022,6 +1022,7 @@ initSigprov(instanceData *pData)
szDrvrName);
goto done;
}
+ pData->sigprov.SetCnfParam(pData->sigprovData, lst);
dbgprintf("loaded signature provider %s, data instance at %p\n",
szDrvrName, pData->sigprovData);
@@ -1111,7 +1112,7 @@ CODESTARTnewActInst
}
if(pData->sigprovName != NULL) {
- initSigprov(pData);
+ initSigprov(pData, lst);
}
tplToUse = ustrdup((pData->tplName == NULL) ? getDfltTpl() : pData->tplName);