diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-02-16 21:07:48 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-02-16 21:07:48 +0000 |
| commit | 819f1629fa7f29978d3e7001568539a7c0c7dc2c (patch) | |
| tree | 835c884dc475d968da0b9ba707c4cd349079e98a | |
| parent | 2a715ede5240227df198b81ed36aba1e5ad2ff6d (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.0@246984 f38db490-d61c-443f-a65b-d21fe96a405b
| -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 66a1abd65..f0c8be13d 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; } |