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)
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@246984 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/tcptls.c b/main/tcptls.c
index 66a1abd65cd007c81ac211e14c64f32d29da609c..f0c8be13d62df9f23840f994aa29efa89e295284 100644 (file)
--- a/main/tcptls.c
+++ b/main/tcptls.c
@@ -465,6 +465,11 @@ void *ast_make_file_from_fd(void *data)
        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;
        }