diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-06 12:04:36 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-06 12:04:36 +0200 |
| commit | 3ab1e5b943d297ed0b23a8988f354fed3fec9fdf (patch) | |
| tree | 4e4e29a0911eebb7e2842e3ec5a6d9a5686720ae /runtime/nsd_ptcp.c | |
| parent | 200e08ac4252a0a0eca31a441e63688179baebb1 (diff) | |
| parent | bb6f5dc40f39220a2cdb05e94d70aac42d971ac4 (diff) | |
| download | rsyslog-3ab1e5b943d297ed0b23a8988f354fed3fec9fdf.tar.gz rsyslog-3ab1e5b943d297ed0b23a8988f354fed3fec9fdf.tar.bz2 rsyslog-3ab1e5b943d297ed0b23a8988f354fed3fec9fdf.zip | |
Merge branch 'master' into master-newruleset
Conflicts:
runtime/rsconf.c
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; } |