From: David Vossel <dvossel@digium.com>
Date: Tue, 16 Feb 2010 21:05:24 +0000 (+0000)
Subject: Merged revisions 246980 via svnmerge from
X-Git-Tag: 1.6.1.18-rc1~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5091019af01b33b2275ecd75caa88f6e0a0fa14c;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.1@246983 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/tcptls.c b/main/tcptls.c
index ea1f1f106f..f14a646c66 100644
--- a/main/tcptls.c
+++ b/main/tcptls.c
@@ -215,6 +215,11 @@ static void *handle_tcptls_connection(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;
 	}