diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-09 17:37:47 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-09 17:37:47 +0100 |
| commit | 6124df83ff69682c0bc6d29eeaea7f9a1b1a2317 (patch) | |
| tree | 112d86ed8645b6a6435380855329d3a4a77f111e /plugins | |
| parent | fe52af4d409a30d50e66f870b9eb503bee47cbfb (diff) | |
| parent | 8d79906d500c5760f093123b3ef3c43508ffce58 (diff) | |
| download | rsyslog-6124df83ff69682c0bc6d29eeaea7f9a1b1a2317.tar.gz rsyslog-6124df83ff69682c0bc6d29eeaea7f9a1b1a2317.tar.xz rsyslog-6124df83ff69682c0bc6d29eeaea7f9a1b1a2317.zip | |
Merge branch 'v5-beta' into v5-devel
Conflicts:
ChangeLog
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/omlibdbi/omlibdbi.c | 2 |
1 files changed, 1 insertions, 1 deletions
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")); |