diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-02-16 21:05:24 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-02-16 21:05:24 +0000 |
| commit | 8a3f59a0f44ff6ef5baab2a93752eb686c81dccd (patch) | |
| tree | c36235df02a7da4c187d11da4f4f0677e5fe22fa /main | |
| parent | f1299822dc6b164fb42908515343b0f953b24f09 (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.1@246983 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/tcptls.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/main/tcptls.c b/main/tcptls.c index ea1f1f106..f14a646c6 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; } |