diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-05-10 15:39:42 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-05-10 15:39:42 +0200 |
| commit | 415b26d5a19d8b1fd50d8e0b7b29cc8527537316 (patch) | |
| tree | 5a8d0652dfd1ed25cd647e976136b92aa625df73 /tools/syslogd.c | |
| parent | 4ae3176e2824607b8016699d3fc3f1f6a8371495 (diff) | |
| download | rsyslog-415b26d5a19d8b1fd50d8e0b7b29cc8527537316.tar.gz rsyslog-415b26d5a19d8b1fd50d8e0b7b29cc8527537316.tar.bz2 rsyslog-415b26d5a19d8b1fd50d8e0b7b29cc8527537316.zip | |
enable shuffling of crypto parameters down through queue definition
Diffstat (limited to 'tools/syslogd.c')
| -rw-r--r-- | tools/syslogd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index 47a21585..d2f249cf 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -1057,7 +1057,7 @@ finalize_it: * the time being (remember that we want to restructure config processing at large!). * rgerhards, 2009-10-27 */ -rsRetVal createMainQueue(qqueue_t **ppQueue, uchar *pszQueueName, struct cnfparamvals *queueParams) +rsRetVal createMainQueue(qqueue_t **ppQueue, uchar *pszQueueName, struct nvlst *lst) { struct queuefilenames_s *qfn; uchar *qfname = NULL; @@ -1073,7 +1073,7 @@ rsRetVal createMainQueue(qqueue_t **ppQueue, uchar *pszQueueName, struct cnfpara /* name our main queue object (it's not fatal if it fails...) */ obj.SetName((obj_t*) (*ppQueue), pszQueueName); - if(queueParams == NULL) { /* use legacy parameters? */ + if(lst == NULL) { /* use legacy parameters? */ /* ... set some properties ... */ # define setQPROP(func, directive, data) \ CHKiRet_Hdlr(func(*ppQueue, data)) { \ @@ -1130,7 +1130,7 @@ rsRetVal createMainQueue(qqueue_t **ppQueue, uchar *pszQueueName, struct cnfpara # undef setQPROPstr } else { /* use new style config! */ qqueueSetDefaultsRulesetQueue(*ppQueue); - qqueueApplyCnfParam(*ppQueue, queueParams); + qqueueApplyCnfParam(*ppQueue, lst); } /* ... and finally start the queue! */ @@ -1887,7 +1887,7 @@ int realMain(int argc, char **argv) if(glbl.GetSourceIPofLocalClient() != NULL) { fprintf (stderr, "rsyslogd: Only one -S argument allowed, the first one is taken.\n"); } else { - glbl.SetSourceIPofLocalClient(arg); + glbl.SetSourceIPofLocalClient((uchar*)arg); } break; case 'f': /* configuration file */ |