From: Wilfried Goesgens <dothebart@citadel.org>
Date: Mon, 29 Dec 2014 23:39:50 +0000 (+0100)
Subject:  - enable TLS
X-Git-Tag: v9.01~64
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=f1f85a4859e53e445bf2d12f7fc9dad6efe0bb68

 - enable TLS
 - void* is better here then char*
---

diff --git a/citadel/modules/xmpp/serv_xmpp.c b/citadel/modules/xmpp/serv_xmpp.c
index ea58e3b62..424c0fdbb 100644
--- a/citadel/modules/xmpp/serv_xmpp.c
+++ b/citadel/modules/xmpp/serv_xmpp.c
@@ -237,13 +237,13 @@ void xmpp_stream_start(void *data, const char *supplied_el, const char **attr)
 	/*
 	 * TLS encryption (but only if it isn't already active)
 	 */ 
-/*
+
 #ifdef HAVE_OPENSSL
 	if (!CC->redirect_ssl) {
 		XPUT("<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'></starttls>");
 	}
 #endif
-*/
+	//*/
 	if (!CC->logged_in) {
 		/* If we're not logged in yet, offer SASL as our feature set */
 		xmpp_output_auth_mechs();
@@ -351,7 +351,7 @@ void xmpp_xml_start(void *data, const char *supplied_el, const char **attr)
 				if (GetHash(th->Properties, attr[i], strlen(attr[i]), &pv))
 				{
 					PropertyHandler* ph = pv;
-					char *val;
+					void *val;
 					StrBuf **pVal;
 					long len;