From: Art Cancro <ajc@citadel.org>
Date: Mon, 14 Feb 2011 03:46:09 +0000 (-0500)
Subject: Only offer XMPP over TLS if we have OpenSSL in the build.
X-Git-Tag: v8.11~857
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=e0303511cb85f600647c3d20c424f8dd5cbc19d0

Only offer XMPP over TLS if we have OpenSSL in the build.
---

diff --git a/citadel/modules/xmpp/serv_xmpp.c b/citadel/modules/xmpp/serv_xmpp.c
index 01d130155..aa3017e49 100644
--- a/citadel/modules/xmpp/serv_xmpp.c
+++ b/citadel/modules/xmpp/serv_xmpp.c
@@ -144,13 +144,12 @@ void xmpp_stream_start(void *data, const char *supplied_el, const char **attr)
 
 	/*
 	 * 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.
-	 */
+	 */ 
+#ifdef HAVE_OPENSSL
 	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 */