diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-09 13:01:57 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-09 13:01:57 +0100 |
| commit | c1760db6bbd07086177679b2be4b2d307657ddce (patch) | |
| tree | 9f639ad8d6a7577b48892d1cd0510ad11fd91e93 | |
| parent | 6bad782f154b7f838c7371bf99c13f6dc4ec4101 (diff) | |
| download | rsyslog-c1760db6bbd07086177679b2be4b2d307657ddce.tar.gz rsyslog-c1760db6bbd07086177679b2be4b2d307657ddce.tar.xz rsyslog-c1760db6bbd07086177679b2be4b2d307657ddce.zip | |
bugfix: omlibdbi did not use password from rsyslog.con
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=203
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | plugins/omlibdbi/omlibdbi.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -23,6 +23,8 @@ Version 4.6.6 [v4-stable] (rgerhards), 2010-11-?? - 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 6f130f54..67b1edf9 100644 --- a/plugins/omlibdbi/omlibdbi.c +++ b/plugins/omlibdbi/omlibdbi.c @@ -287,7 +287,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")); |