diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-09 13:09:14 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-09 13:09:14 +0100 |
commit | 9f7f8cc2547b759f6f0584b6fa88ff006277d445 (patch) | |
tree | cc4f97c5badff457c2375d733eae132529b3ae41 | |
parent | 533a5351365cec93f233e0e99d98cedeadc5bd69 (diff) | |
parent | dffb2bab8cb52599626b82587da09df39b16e7aa (diff) | |
download | rsyslog-9f7f8cc2547b759f6f0584b6fa88ff006277d445.tar.gz rsyslog-9f7f8cc2547b759f6f0584b6fa88ff006277d445.tar.xz rsyslog-9f7f8cc2547b759f6f0584b6fa88ff006277d445.zip |
Merge branch 'v5-stable' into v5-beta
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | plugins/omlibdbi/omlibdbi.c | 2 |
2 files changed, 8 insertions, 1 deletions
@@ -125,6 +125,8 @@ Version 5.7.0 [V5-DEVEL] (rgerhards), 2010-09-16 * sd-systemd API added as part of rsyslog runtime library --------------------------------------------------------------------------- Version 5.6.5 [V5-STABLE] (rgerhards), 2011-03-?? +- bugfix: omlibdbi did not use password from rsyslog.con + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=203 - bugfix(kind of): tell users that config graph can currently not be generated closes: http://bugzilla.adiscon.com/show_bug.cgi?id=232 @@ -760,6 +762,11 @@ Version 4.6.6 [v4-stable] (rgerhards), 2010-11-?? - bugfix: imfile utilizes 32 bit to track offset. Most importantly, this problem can not experienced on Fedora 64 bit OS (which has 64 bit long's!) +- bugfix: abort if imfile reads file line of more than 64KiB + Thanks to Peter Eisentraut for reporting and analysing this problem. + bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=221 +- bugfix: omlibdbi did not use password from rsyslog.con + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=203 - some improvements thanks to clang's static code analyzer o overall cleanup (mostly unnecessary writes and otherwise unused stuff) o bugfix: fixed a very remote problem in msg.c which could occur when diff --git a/plugins/omlibdbi/omlibdbi.c b/plugins/omlibdbi/omlibdbi.c index 4b190ce3..f49bef42 100644 --- a/plugins/omlibdbi/omlibdbi.c +++ b/plugins/omlibdbi/omlibdbi.c @@ -288,7 +288,7 @@ CODE_STD_STRING_REQUESTparseSelectorAct(1) if(dbName != NULL) if((pData->dbName = (uchar*) strdup((char*)dbName)) == NULL) ABORT_FINALIZE(RS_RET_OUT_OF_MEMORY); if(pwd != NULL) - if((pData->pwd = (uchar*) strdup((char*)"")) == NULL) ABORT_FINALIZE(RS_RET_OUT_OF_MEMORY); + if((pData->pwd = (uchar*) strdup((char*)pwd)) == NULL) ABORT_FINALIZE(RS_RET_OUT_OF_MEMORY); CHKiRet(cflineParseTemplateName(&p, *ppOMSR, 0, OMSR_RQD_TPL_OPT_SQL, (uchar*) " StdDBFmt")); |