From: David Vossel <dvossel@digium.com>
Date: Tue, 16 Feb 2010 21:07:48 +0000 (+0000)
Subject: Merged revisions 246980 via svnmerge from
X-Git-Tag: 1.6.0.26-rc1~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b98e6042e843c8df6744508cf97d2bf06508bece;p=thirdparty%2Fasterisk.git

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 66a1abd65c..f0c8be13d6 100644
--- 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;
 	}