[asterisk-commits] mjordan: trunk r369870 - /trunk/main/libasteriskssl.c

[SVN commits to the Asterisk project]

Author: mjordan
Date: Tue Jul 10 08:34:15 2012
New Revision: 369870

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=369870
Log:
Fix initial loading problem with res_curl

When the OpenSSL duplicate initialization issues were resolved in r351447,
res_curl could fail to load if it checked SSL_library_init after SSL
initialization completed.  This is due to the SSL_library_init stub returning
a value of 0 for success, as opposed to a value of 1.  OpenSSL uses a value of
1 to indicate success - in fact, SSL_library_init is documented to always return
1.  Interestingly, the CURL libraries actually checked the return value - the fact
that nothing else that depends on OpenSSL was having problems loading probably means
they don't check the return value.

(closes issue AST-924)
Reported by: Guenther Kelleter
patches:
  (AST-924.patch license #6372 uploaded by Guenther Kelleter)

Modified:
    trunk/main/libasteriskssl.c

Modified: trunk/main/libasteriskssl.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/libasteriskssl.c?view=diff&rev=369870&r1=369869&r2=369870
==============================================================================
--- trunk/main/libasteriskssl.c (original)
+++ trunk/main/libasteriskssl.c Tue Jul 10 08:34:15 2012
@@ -81,7 +81,7 @@
 		ast_debug(1, "Called after startup... ignoring!\n");
 	}
 #endif
-	return 0;
+	return 1;
 }
 
 void SSL_load_error_strings(void)