2 files changed, 8 insertions, 3 deletions
diff --git a/cpp/src/IceSSL/SslTransceiver.cpp b/cpp/src/IceSSL/SslTransceiver.cpp
index 30ae7c89e9e..d7c0b62a173 100644
--- a/cpp/src/IceSSL/SslTransceiver.cpp
+++ b/cpp/src/IceSSL/SslTransceiver.cpp
@@ -420,9 +420,9 @@ IceSSL::SslTransceiver::initialize(int timeout)
 	    //
 	    // Init finished, look at the connection information.
 	    //
-	    if((_traceLevels->security >= IceSSL::SECURITY_PROTOCOL_DEBUG) && 0)
+#ifdef ICE_SSL_EXTRA_TRACING	
+	    if(_traceLevels->security >= IceSSL::SECURITY_PROTOCOL_DEBUG)
 	    {
-#ifdef ICE_SSL_EXTRA_TRACING
 		//
 		// Only in extreme cases do we enable this, partially because it doesn't use the Logger.
 		//
@@ -440,8 +440,8 @@ IceSSL::SslTransceiver::initialize(int timeout)
 		showHandshakeStats(bio);
 		
 		showSessionInfo(bio);
-#endif
 	    }
+#endif
 	    return;
 	}
 
@@ -823,6 +823,8 @@ IceSSL::SslTransceiver::removeTransceiver(SSL* sslPtr)
     _transceiverMap.erase(sslPtr);
 }
 
+#ifdef ICE_SSL_EXTRA_TRACING
+
 void
 IceSSL::SslTransceiver::showCertificateChain(BIO* bio)
 {
@@ -1001,6 +1003,7 @@ IceSSL::SslTransceiver::showClientCAList(BIO* bio, const char* connType)
     }
 }
 
+#endif
 
 //
 // Private Methods
diff --git a/cpp/src/IceSSL/SslTransceiver.h b/cpp/src/IceSSL/SslTransceiver.h
index 6e1e35d167f..90fefa37387 100644
--- a/cpp/src/IceSSL/SslTransceiver.h
+++ b/cpp/src/IceSSL/SslTransceiver.h
@@ -68,6 +68,7 @@ private:
     static void addTransceiver(SSL*, SslTransceiver*);
     static void removeTransceiver(SSL*);
 
+#ifdef ICE_SSL_EXTRA_TRACING
     void showCertificateChain(BIO*);
     void showPeerCertificate(BIO*, const char*);
     void showSharedCiphers(BIO*);
@@ -75,6 +76,7 @@ private:
     void showSelectedCipherInfo(BIO*);
     void showHandshakeStats(BIO*);
     void showClientCAList(BIO*, const char*);
+#endif
 
     static SslTransceiverMap _transceiverMap;
     static IceUtil::StaticMutex _transceiverRepositoryMutex;