[asterisk-commits] mmichelson: trunk r367418 - in /trunk: ./ main/tcptls.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed May 23 15:30:21 2012
New Revision: 367418

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=367418
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
........

Merged revisions 367417 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    trunk/   (props changed)
    trunk/main/tcptls.c

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

Modified: trunk/main/tcptls.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/tcptls.c?view=diff&rev=367418&r1=367417&r2=367418
==============================================================================
--- trunk/main/tcptls.c (original)
+++ trunk/main/tcptls.c Wed May 23 15:30:21 2012
@@ -417,10 +417,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)