diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-09 12:48:15 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-09 12:48:15 +0200 |
| commit | 1d41b9540ccf8b6714135737855ab71ee75f4364 (patch) | |
| tree | 2ce7356d2d4fcb4426edfd7e0ddd473bbed4baf5 /plugins/omlibdbi/omlibdbi.c | |
| parent | 579c61e579d9452682da51ec5e4b547684573807 (diff) | |
| parent | 831ce25230f6c8cd7c362fda3616e1233a61cf00 (diff) | |
| download | rsyslog-1d41b9540ccf8b6714135737855ab71ee75f4364.tar.gz rsyslog-1d41b9540ccf8b6714135737855ab71ee75f4364.tar.bz2 rsyslog-1d41b9540ccf8b6714135737855ab71ee75f4364.zip | |
Merge branch 'v4-stable' into v4-devel
Conflicts:
tcpsrv.c
tests/Makefile.am
tests/tcpflood.c
Diffstat (limited to 'plugins/omlibdbi/omlibdbi.c')
| -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 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")); |