[asterisk-commits] mmichelson: branch 10 r367417 - in /branches/10: ./ main/tcptls.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed May 23 15:29:03 2012
New Revision: 367417

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=367417
Log:
Only call SSL_CTX_free if DO_SSL is defined.

Thanks to Paul Belanger for pointing out this error.
........

Merged revisions 367416 from http://svn.asterisk.org/svn/asterisk/branches/1.8

Modified:
    branches/10/   (props changed)
    branches/10/main/tcptls.c

Propchange: branches/10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/10/main/tcptls.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/main/tcptls.c?view=diff&rev=367417&r1=367416&r2=367417
==============================================================================
--- branches/10/main/tcptls.c (original)
+++ branches/10/main/tcptls.c Wed May 23 15:29:03 2012
@@ -403,10 +403,12 @@
 
 void ast_ssl_teardown(struct ast_tls_config *cfg)
 {
+#ifdef DO_SSL
 	if (cfg->ssl_ctx) {
 		SSL_CTX_free(cfg->ssl_ctx);
 		cfg->ssl_ctx = NULL;
 	}
+#endif
 }
 
 struct ast_tcptls_session_instance *ast_tcptls_client_start(struct ast_tcptls_session_instance *tcptls_session)