aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authordvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2010-02-16 21:03:57 +0000
committerdvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2010-02-16 21:03:57 +0000
commitbb4c1221fb6524ebe50cd8106c84dae8ad756df4 (patch)
treeb99f6bb5f7b5a021953ebe74a252367a62da16b3 /main
parentecaebf33d28fdcb960caef8b72ff6020c4eca94c (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@246982 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r--main/tcptls.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/main/tcptls.c b/main/tcptls.c
index 4b0bab30d..d433facf5 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;
}