summaryrefslogtreecommitdiffstats
path: root/runtime
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-06-14 14:22:37 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-06-14 14:22:37 +0200
commitf4c5f0a4cc2b06865e048d7c7c716ca7ca2a3b06 (patch)
tree923b0bdf2e87fa7e28eaf735ed037f56289730cb /runtime
parent49d7b4cd666429ece524ea4b3b2bd4041b5662e5 (diff)
parent6afbb39ea197623688e36b74f81f5ec45d0b15ff (diff)
downloadrsyslog-f4c5f0a4cc2b06865e048d7c7c716ca7ca2a3b06.tar.gz
rsyslog-f4c5f0a4cc2b06865e048d7c7c716ca7ca2a3b06.tar.xz
rsyslog-f4c5f0a4cc2b06865e048d7c7c716ca7ca2a3b06.zip
Merge branch 'v4-devel' into v5-devel
Conflicts: tcpsrv.c
Diffstat (limited to 'runtime')
-rw-r--r--runtime/nsd_gtls.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/runtime/nsd_gtls.c b/runtime/nsd_gtls.c
index 152dc8de..ca4b2928 100644
--- a/runtime/nsd_gtls.c
+++ b/runtime/nsd_gtls.c
@@ -1121,6 +1121,7 @@ gtlsEndSess(nsd_gtls_t *pThis)
}
}
gnutls_deinit(pThis->sess);
+ pThis->bHaveSess = 0;
}
RETiRet;
}
@@ -1174,6 +1175,8 @@ CODESTARTobjDestruct(nsd_gtls)
gnutls_x509_crt_deinit(pThis->ourCert);
if(pThis->bOurKeyIsInit)
gnutls_x509_privkey_deinit(pThis->ourKey);
+ if(pThis->bHaveSess)
+ gnutls_deinit(pThis->sess);
ENDobjDestruct(nsd_gtls)