* More XMPP tweaks, none of which fixed our current batch of problems

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

diff --git a/citadel/modules/xmpp/xmpp_query_namespace.c b/citadel/modules/xmpp/xmpp_query_namespace.c
index 5bfe7ae11641fd11ed2210ab2d311831432134a3..42875074ee7c882766ffe7db4f80eee9ba7da640 100644 (file)
--- a/citadel/modules/xmpp/xmpp_query_namespace.c
+++ b/citadel/modules/xmpp/xmpp_query_namespace.c
@@ -122,7 +122,7 @@ void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_x
         */
        if (
                (!strcasecmp(query_xmlns, "jabber:iq:roster:query"))
-               && (!strcasecmp(query_xmlns, "jabber:iq:auth:query"))
+               || (!strcasecmp(query_xmlns, "jabber:iq:auth:query"))
        ) {
                supported_namespace = 1;
        }
@@ -158,17 +158,21 @@ void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_x
                );
        }
 
+       /*
+        * If we didn't hit any known query namespaces then we should deliver a
+        * "service unavailable" error (see RFC3921 section 2.4 and 11.1.5.4)
+        */
+
        else {
-               CtdlLogPrintf(CTDL_DEBUG, "Unknown namespace; returning <service-unavailable/>\n");
+               CtdlLogPrintf(CTDL_DEBUG,
+                       "Unknown query namespace '%s' - returning <service-unavailable/>\n",
+                       query_xmlns
+               );
                cprintf("<error code=\"503\" type=\"cancel\">"
                        "<service-unavailable xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\"/>"
                        "</error>"
                );
        }
 
-       /*
-        * End of query result.  If we didn't hit any known namespaces then we should
-        * deliver a "service unavailable" error (see RFC3921 section 2.4 and 11.1.5.4)
-        */
        cprintf("</iq>");
 }