diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-27 09:46:41 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-27 09:46:41 +0200 |
| commit | 16dc3aab3db9b8db4cb4fc8d241d4cd5d5362b8a (patch) | |
| tree | 09945c52f5b465460a1ffd9b0f2fb2b3d8939c9f /runtime | |
| parent | f3d4d83ce5a921899775eb59997d9d954b2f423d (diff) | |
| parent | f3a7232069730e94519d7cc06fe0d82bf21b0162 (diff) | |
| download | rsyslog-16dc3aab3db9b8db4cb4fc8d241d4cd5d5362b8a.tar.gz rsyslog-16dc3aab3db9b8db4cb4fc8d241d4cd5d5362b8a.tar.xz rsyslog-16dc3aab3db9b8db4cb4fc8d241d4cd5d5362b8a.zip | |
Merge branch 'v5-stable' into beta
Conflicts:
ChangeLog
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/nsd_gtls.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/runtime/nsd_gtls.c b/runtime/nsd_gtls.c index cc8f78d1..ad39ccb7 100644 --- a/runtime/nsd_gtls.c +++ b/runtime/nsd_gtls.c @@ -202,10 +202,14 @@ finalize_it: if(iRet != RS_RET_OK) { if(data.data != NULL) free(data.data); - if(pThis->bOurCertIsInit) + if(pThis->bOurCertIsInit) { gnutls_x509_crt_deinit(pThis->ourCert); - if(pThis->bOurKeyIsInit) + pThis->bOurCertIsInit = 0; + } + if(pThis->bOurKeyIsInit) { gnutls_x509_privkey_deinit(pThis->ourKey); + pThis->bOurKeyIsInit = 0; + } } RETiRet; } |