From: Art Cancro <ajc@citadel.org>
Date: Mon, 14 Feb 2011 03:41:08 +0000 (-0500)
Subject: Enable XMPP over TLS.
X-Git-Tag: v8.11~858
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=cc00637cea7e19beee2a3ad1c8f0baf3f233d789

Enable XMPP over TLS.
I don't know why this works now when it didn't work before.
Perhaps we fixed something in the I/O layer recently.
---

diff --git a/citadel/modules/xmpp/serv_xmpp.c b/citadel/modules/xmpp/serv_xmpp.c
index a3084c6b1..01d130155 100644
--- a/citadel/modules/xmpp/serv_xmpp.c
+++ b/citadel/modules/xmpp/serv_xmpp.c
@@ -142,12 +142,15 @@ void xmpp_stream_start(void *data, const char *supplied_el, const char **attr)
 	/* The features of this stream are... */
 	cprintf("<stream:features>");
 
-#ifdef HAVE_OPENSSL_XXXX_COMMENTED_OUT
-	/* TLS encryption (but only if it isn't already active) */
+	/*
+	 * TLS encryption (but only if it isn't already active)
+	 * 
+	 * NOTE: if TLS doesn't handshake properly for whatever reason,
+	 * comment out these three lines to disable it at the server.
+	 */
 	if (!CC->redirect_ssl) {
 		cprintf("<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 */