diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-01-13 11:30:48 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-01-13 11:30:48 +0100 |
| commit | 614b1fba0a56629579ec9bf1cc07cc19bba35e0c (patch) | |
| tree | c1ed983bf85944a5ccd5ae3edca26c01ebee4450 | |
| parent | 53b3895f759461f57d28bf4053cf175704154570 (diff) | |
| download | rsyslog-614b1fba0a56629579ec9bf1cc07cc19bba35e0c.tar.gz rsyslog-614b1fba0a56629579ec9bf1cc07cc19bba35e0c.tar.bz2 rsyslog-614b1fba0a56629579ec9bf1cc07cc19bba35e0c.zip | |
bugfix: omelasticsearch failed when authentication data was provided
... at least in most cases it emitted an error message:
"snprintf failed when trying to build auth string"
Thanks to Joerg Heinemann for alerting us.
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=404
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | plugins/omelasticsearch/omelasticsearch.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,6 +1,11 @@ ---------------------------------------------------------------------------- Version 7.2.6 [v7-stable] 2013-01-?? - slightly improved config parser error messages when invalid escapes happen +- bugfix: omelasticsearch failed when authentication data was provided + ... at least in most cases it emitted an error message: + "snprintf failed when trying to build auth string" + Thanks to Joerg Heinemann for alerting us. + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=404 - bugfix: some property-based filter were incorrectly parsed This usually lead to a syntax error on startup and rsyslogd not actually starting up. The problem was the regex, which did not care for double diff --git a/plugins/omelasticsearch/omelasticsearch.c b/plugins/omelasticsearch/omelasticsearch.c index 50acdf11..00e4dbac 100644 --- a/plugins/omelasticsearch/omelasticsearch.c +++ b/plugins/omelasticsearch/omelasticsearch.c @@ -314,7 +314,7 @@ setCurlURL(instanceData *pData, uchar **tpls) if(pData->uid != NULL) { rLocal = snprintf(authBuf, sizeof(authBuf), "%s:%s", pData->uid, (pData->pwd == NULL) ? "" : (char*)pData->pwd); - if(rLocal != (int) es_strlen(url)) { + if(rLocal < 1) { errmsg.LogError(0, RS_RET_ERR, "omelasticsearch: snprintf failed " "when trying to build auth string (return %d)\n", rLocal); |