[asterisk-commits] kpfleming: branch 10 r330649 - in /branches/10: ./ res/res_jabber.c

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Tue Aug  2 15:52:44 2011
New Revision: 330649

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=330649
Log:
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.
........

Modified:
    branches/10/   (props changed)
    branches/10/res/res_jabber.c

Propchange: branches/10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/10/res/res_jabber.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/res/res_jabber.c?view=diff&rev=330649&r1=330648&r2=330649
==============================================================================
--- branches/10/res/res_jabber.c (original)
+++ branches/10/res/res_jabber.c Tue Aug  2 15:52:44 2011
@@ -1654,7 +1654,7 @@
 		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