diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-06-12 14:11:39 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-06-12 14:11:39 +0200 |
| commit | 63d0d895a2ed1d0b04508d9cc645791f063607ac (patch) | |
| tree | 3586b8b598fe957d2db7a2c815cb5c48f481ef0a /plugins/imrelp/imrelp.c | |
| parent | 0df900240b19caec85a627488dfb3ee685e5b737 (diff) | |
| download | rsyslog-63d0d895a2ed1d0b04508d9cc645791f063607ac.tar.gz rsyslog-63d0d895a2ed1d0b04508d9cc645791f063607ac.tar.bz2 rsyslog-63d0d895a2ed1d0b04508d9cc645791f063607ac.zip | |
imrelp: add capability to directly specify GnuTLS priority string
Diffstat (limited to 'plugins/imrelp/imrelp.c')
| -rw-r--r-- | plugins/imrelp/imrelp.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/plugins/imrelp/imrelp.c b/plugins/imrelp/imrelp.c index 100574b1..e0082f89 100644 --- a/plugins/imrelp/imrelp.c +++ b/plugins/imrelp/imrelp.c @@ -77,6 +77,7 @@ struct instanceConf_s { sbool bEnableTLS; sbool bEnableTLSZip; int dhBits; + uchar *pristring; /* GnuTLS priority string (NULL if not to be provided) */ struct instanceConf_s *next; }; @@ -106,6 +107,7 @@ static struct cnfparamdescr inppdescr[] = { { "port", eCmdHdlrString, CNFPARAM_REQUIRED }, { "tls", eCmdHdlrBinary, 0 }, { "tls.dhbits", eCmdHdlrInt, 0 }, + { "tls.prioritystring", eCmdHdlrInt, 0 }, { "tls.compression", eCmdHdlrBinary, 0 } }; static struct cnfparamblk inppblk = @@ -174,6 +176,7 @@ createInstance(instanceConf_t **pinst) inst->bEnableTLS = 0; inst->bEnableTLSZip = 0; inst->dhBits = 0; + inst->pristring = NULL; /* node created, let's add to config */ if(loadModConf->tail == NULL) { @@ -246,6 +249,7 @@ addListner(modConfData_t __attribute__((unused)) *modConf, instanceConf_t *inst) if(inst->dhBits) { relpSrvSetDHBits(pSrv, inst->dhBits); } + relpSrvSetGnuTLSPriString(pSrv, (char*)inst->pristring); } CHKiRet(relpEngineListnerConstructFinalize(pRelpEngine, pSrv)); @@ -284,6 +288,8 @@ CODESTARTnewInpInst inst->bEnableTLS = (unsigned) pvals[i].val.d.n; } else if(!strcmp(inppblk.descr[i].name, "tls.dhbits")) { inst->dhBits = (unsigned) pvals[i].val.d.n; + } else if(!strcmp(inppblk.descr[i].name, "tls.prioritystring")) { + inst->pristring = (uchar*)es_str2cstr(pvals[i].val.d.estr, NULL); } else if(!strcmp(inppblk.descr[i].name, "tls.compression")) { inst->bEnableTLSZip = (unsigned) pvals[i].val.d.n; } else { |