summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2011-08-02 20:54:19 +0000
committerKevin P. Fleming <kpfleming@digium.com>2011-08-02 20:54:19 +0000
commited6ac7359f831dc554d9a41eb0318057de79522c (patch)
tree35332d8d4554699b5caca588c5077942fbc4f0cd
parente128ee256726e002307cf24b37aae40e29a6c9e6 (diff)
Merged revisions 330649 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10 ................ r330649 | kpfleming | 2011-08-02 15:52:44 -0500 (Tue, 02 Aug 2011) | 9 lines Merged revisions 330648 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r330648 | kpfleming | 2011-08-02 15:51:56 -0500 (Tue, 02 Aug 2011) | 2 lines Convert an error message to actually be helpful. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330650 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--res/res_jabber.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/res/res_jabber.c b/res/res_jabber.c
index 46229520a..838b6c342 100644
--- a/res/res_jabber.c
+++ b/res/res_jabber.c
@@ -1654,7 +1654,7 @@ static int aji_act_hook(void *data, int type, iks *node)
case IKS_NODE_START:
if (client->usetls && !aji_is_secure(client)) {
#ifndef HAVE_OPENSSL
- ast_log(LOG_ERROR, "OpenSSL not installed. You need to install OpenSSL on this system, or disable the TLS option in your configuration file\n");
+ ast_log(LOG_ERROR, "TLS connection cannot be established. Please install OpenSSL and its development libraries on this system, or disable the TLS option in your configuration file\n");
ASTOBJ_UNREF(client, aji_client_destroy);
return IKS_HOOK;
#else