summaryrefslogtreecommitdiffstats
path: root/runtime/nsd_ptcp.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-09-06 12:00:30 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-09-06 12:00:30 +0200
commitbb6f5dc40f39220a2cdb05e94d70aac42d971ac4 (patch)
tree7e3b5ea5a00171c519e1c1f8c1f97de3a3a1aa9a /runtime/nsd_ptcp.c
parentddea340e665a657bc6be88176130d1221c0dec3d (diff)
parent74b81c8c01b26a142793a4861340996ed956f5f6 (diff)
downloadrsyslog-bb6f5dc40f39220a2cdb05e94d70aac42d971ac4.tar.gz
rsyslog-bb6f5dc40f39220a2cdb05e94d70aac42d971ac4.tar.bz2
rsyslog-bb6f5dc40f39220a2cdb05e94d70aac42d971ac4.zip
Merge branch 'v6-devel'
Diffstat (limited to 'runtime/nsd_ptcp.c')
-rw-r--r--runtime/nsd_ptcp.c6
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;
}