From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 15 Jan 2017 11:31:22 +0000 (+1300)
Subject: Fix SessionClose when OpenSSl and GnuTLS are both linked
X-Git-Tag: M-staged-PR71~284^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6a0f60364bfa3dcc48867093c812c73a0bbc4d1b;p=thirdparty%2Fsquid.git

Fix SessionClose when OpenSSl and GnuTLS are both linked
---

diff --git a/src/security/Session.cc b/src/security/Session.cc
index 0514cc3203..2649aafb08 100644
--- a/src/security/Session.cc
+++ b/src/security/Session.cc
@@ -189,10 +189,8 @@ Security::SessionClose(const Security::SessionPointer &s, const int fdOnError)
         SSL_shutdown(s.get());
 #elif USE_GNUTLS
         gnutls_bye(s.get(), GNUTLS_SHUT_RDWR);
-#endif
     }
 
-#if USE_GNUTLS
     // XXX: should probably be done for OpenSSL too, but that needs testing.
     if (fdOnError != -1) {
         debugs(83, 5, "unlink FD " << fdOnError << " from TLS session=" << (void*)fd_table[fdOnError].ssl.get());
@@ -200,8 +198,8 @@ Security::SessionClose(const Security::SessionPointer &s, const int fdOnError)
         fd_table[fdOnError].read_method = &default_read_method;
         fd_table[fdOnError].write_method = &default_write_method;
         fd_note(fdOnError, "TLS error");
-    }
 #endif
+    }
 }
 
 bool