[svn-commits] dvossel: branch 1.6.0 r246984 - in /branches/1.6.0: ./ main/tcptls.c

[SVN commits to the Digium repositories]

Author: dvossel
Date: Tue Feb 16 15:07:48 2010
New Revision: 246984

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=246984
Log:
Merged revisions 246980 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r246980 | dvossel | 2010-02-16 14:54:48 -0600 (Tue, 16 Feb 2010) | 8 lines
  
  warning message if openssl support is missing while attempting tls connection
  
  (closes issue #16673)
  Reported by: michaesc
  Patches:
        tls_error_msg.diff uploaded by dvossel (license 671)
........

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

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/tcptls.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/main/tcptls.c?view=diff&rev=246984&r1=246983&r2=246984
==============================================================================
--- branches/1.6.0/main/tcptls.c (original)
+++ branches/1.6.0/main/tcptls.c Tue Feb 16 15:07:48 2010
@@ -465,6 +465,11 @@
 	if (!tcptls_session->f) {
 		close(tcptls_session->fd);
 		ast_log(LOG_WARNING, "FILE * open failed!\n");
+#ifndef DO_SSL
+		if (tcptls_session->parent->tls_cfg) {
+			ast_log(LOG_WARNING, "Attempted a TLS connection without OpenSSL support.  This will not work!\n");
+		}
+#endif
 		ao2_ref(tcptls_session, -1);
 		return NULL;
 	}