diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-07-05 14:31:11 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-07-05 14:31:11 +0200 |
| commit | 992e01b4bbf3f7ba52eb28ba0b347cfd32564c4f (patch) | |
| tree | b4ff9cc03542e0a028e0eb04c6508d2184004dc9 | |
| parent | e43808ffc0a63ad8b7cf122a9cf1cb42865dda21 (diff) | |
| parent | df5d877282690154ec81b81c458d3badb25aada4 (diff) | |
| download | rsyslog-992e01b4bbf3f7ba52eb28ba0b347cfd32564c4f.tar.gz rsyslog-992e01b4bbf3f7ba52eb28ba0b347cfd32564c4f.tar.bz2 rsyslog-992e01b4bbf3f7ba52eb28ba0b347cfd32564c4f.zip | |
Merge branch 'v7-stable'
Conflicts:
ChangeLog
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | plugins/omlibdbi/omlibdbi.c | 4 |
2 files changed, 8 insertions, 1 deletions
@@ -64,6 +64,11 @@ Version 7.5.0 [devel] 2013-06-11 connections Thanks to Axel Rau for the patch. --------------------------------------------------------------------------- +Version 7.4.3 [v7.4-stable] 2013-07-?? +- bugfix: omlibdbi did not properly close connection on some errors + This happened to errors occuring in Begin/End Transaction entry + points. +--------------------------------------------------------------------------- Version 7.4.2 [v7.4-stable] 2013-07-04 - bugfix: in RFC5425 TLS, multiple wildcards in auth could cause segfault - bugfix: RainerScript object required parameters were not properly diff --git a/plugins/omlibdbi/omlibdbi.c b/plugins/omlibdbi/omlibdbi.c index c3cac539..3beba4f0 100644 --- a/plugins/omlibdbi/omlibdbi.c +++ b/plugins/omlibdbi/omlibdbi.c @@ -344,7 +344,8 @@ CODESTARTbeginTransaction dbi_conn_error(pData->conn, &emsg); dbgprintf("libdbi server error: begin transaction " "not successful: %s\n", emsg); - iRet = RS_RET_SUSPENDED; + closeConn(pData); + ABORT_FINALIZE(RS_RET_SUSPENDED); } } # endif @@ -372,6 +373,7 @@ CODESTARTendTransaction dbi_conn_error(pData->conn, &emsg); dbgprintf("libdbi server error: transaction not committed: %s\n", emsg); + closeConn(pData); iRet = RS_RET_SUSPENDED; } # endif |