diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-06 12:00:05 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-06 12:00:05 +0200 |
| commit | 74b81c8c01b26a142793a4861340996ed956f5f6 (patch) | |
| tree | 0a01b48d6bcc6a3fae57a0ed073e8a70f7fe9099 /runtime/nsd_ptcp.c | |
| parent | 0426ad7dd27fda6854f7d306e46331387b20947a (diff) | |
| parent | 88faed212c045cd53671155bd4af8a606b08b706 (diff) | |
| download | rsyslog-74b81c8c01b26a142793a4861340996ed956f5f6.tar.gz rsyslog-74b81c8c01b26a142793a4861340996ed956f5f6.tar.bz2 rsyslog-74b81c8c01b26a142793a4861340996ed956f5f6.zip | |
Merge branch 'v6-stable' into v6-devel
Diffstat (limited to 'runtime/nsd_ptcp.c')
| -rw-r--r-- | runtime/nsd_ptcp.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/runtime/nsd_ptcp.c b/runtime/nsd_ptcp.c index a174899c..12f891ea 100644 --- a/runtime/nsd_ptcp.c +++ b/runtime/nsd_ptcp.c @@ -694,9 +694,10 @@ finalize_it: * http://blog.gerhards.net/2008/06/getting-bit-more-reliability-from-plain.html * rgerhards, 2008-06-09 */ -static void +static rsRetVal CheckConnection(nsd_t *pNsd) { + DEFiRet; int rc; char msgbuf[1]; /* dummy */ nsd_ptcp_t *pThis = (nsd_ptcp_t*) pNsd; @@ -709,7 +710,10 @@ CheckConnection(nsd_t *pNsd) * need to close our side, too. */ sockClose(&pThis->sock); + ABORT_FINALIZE(RS_RET_IO_ERROR); } +finalize_it: + RETiRet; } |