- enable TLS

[citadel.git] / citadel / modules / xmpp / serv_xmpp.c

diff --git a/citadel/modules/xmpp/serv_xmpp.c b/citadel/modules/xmpp/serv_xmpp.c
index 63b27c5138936a650f58d9a4eecae8a45a2d0a1b..424c0fdbb20608668c744f99fdd289ee2d6eb3e2 100644 (file)
--- 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();
@@ -282,7 +282,7 @@ void xmpp_start_auth(void *data, const char *supplied_el, const char **attr)
                }
        }
 }
-
+/*
 void xmpp_start_message(void *data, const char *supplied_el, const char **attr)
 {
        int i;
@@ -293,7 +293,7 @@ void xmpp_start_message(void *data, const char *supplied_el, const char **attr)
                }
        }
 }
-
+*/
 void xmpp_start_html(void *data, const char *supplied_el, const char **attr)
 {
        ++XMPP->html_tag_level;
@@ -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;
 
@@ -931,7 +931,7 @@ CTDL_MODULE_INIT(xmpp)
                AddXMPPStartHandler(HKEY("query"),      xmpp_start_query, 0);
                AddXMPPStartHandler(HKEY("bind"),       xmpp_start_bind, 0);
                AddXMPPStartHandler(HKEY("auth"),       xmpp_start_auth, 0);
-               AddXMPPStartHandler(HKEY("message"),    xmpp_start_message, 0);
+///            AddXMPPStartHandler(HKEY("message"),    xmpp_start_message, 0);
                AddXMPPStartHandler(HKEY("html"),       xmpp_start_html, 0);