diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-26 17:35:54 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-26 17:35:54 +0100 |
| commit | f77dc853ed217e824d86bf8feb0c6e75cc0f230e (patch) | |
| tree | 95b6b6dc8afe4ddcfb547675e67ee9fdcd5bb00c /runtime | |
| parent | 809c7e3cdcba3bef8d29702f37c3c8b580c3d1bd (diff) | |
| parent | e5fe270bdbcfbdd22cf9dcc71e7a83b6cc88a979 (diff) | |
| download | rsyslog-f77dc853ed217e824d86bf8feb0c6e75cc0f230e.tar.gz rsyslog-f77dc853ed217e824d86bf8feb0c6e75cc0f230e.tar.xz rsyslog-f77dc853ed217e824d86bf8feb0c6e75cc0f230e.zip | |
Merge branch 'beta' into master
Conflicts:
ChangeLog
action.c
configure.ac
doc/manual.html
doc/rsyslog_conf_modules.html
tests/sndrcv_drvr.sh
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/nsd_gtls.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/runtime/nsd_gtls.c b/runtime/nsd_gtls.c index 74c142f2..0ee70e56 100644 --- a/runtime/nsd_gtls.c +++ b/runtime/nsd_gtls.c @@ -1327,7 +1327,10 @@ finalize_it: static void CheckConnection(nsd_t __attribute__((unused)) *pNsd) { - /* dummy, do nothing */ + nsd_gtls_t *pThis = (nsd_gtls_t*) pNsd; + ISOBJ_TYPE_assert(pThis, nsd_gtls); + + nsd_ptcp.CheckConnection(pThis->pTcp); } |