diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-06-14 15:09:41 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-06-14 15:09:41 +0200 |
commit | fee33477845949c2f03000044b2dbc31382b48f1 (patch) | |
tree | d8ed2472205504b72273b088486f01d42d4c98de /runtime/nsd_gtls.c | |
parent | 7f0c927623b6425fee2c39b2d5207d7c36e32acd (diff) | |
parent | 28af40670e9dc1a85a24dfcbb093ddc1171e151f (diff) | |
download | rsyslog-fee33477845949c2f03000044b2dbc31382b48f1.tar.gz rsyslog-fee33477845949c2f03000044b2dbc31382b48f1.tar.xz rsyslog-fee33477845949c2f03000044b2dbc31382b48f1.zip |
Merge branch 'v5-stable' into beta
Conflicts:
ChangeLog
runtime/nsd_gtls.c
tcpsrv.c
tests/Makefile.am
Diffstat (limited to 'runtime/nsd_gtls.c')
-rw-r--r-- | runtime/nsd_gtls.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/runtime/nsd_gtls.c b/runtime/nsd_gtls.c index d0fd0e0f..cc8f78d1 100644 --- a/runtime/nsd_gtls.c +++ b/runtime/nsd_gtls.c @@ -1099,6 +1099,7 @@ gtlsEndSess(nsd_gtls_t *pThis) } } gnutls_deinit(pThis->sess); + pThis->bHaveSess = 0; } RETiRet; } @@ -1152,8 +1153,8 @@ CODESTARTobjDestruct(nsd_gtls) gnutls_x509_crt_deinit(pThis->ourCert); if(pThis->bOurKeyIsInit) gnutls_x509_privkey_deinit(pThis->ourKey); -#warning need more checks if the new gnutls_deinit() breaks things during normal operations -// gnutls_deinit(pThis->sess); /* see ln 600 pThis->bInSess as something to check? */ + if(pThis->bHaveSess) + gnutls_deinit(pThis->sess); ENDobjDestruct(nsd_gtls) |