XMPP: add X-Macros to automated parse tokens

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

diff --git a/citadel/modules/xmpp/xmpp_sasl_service.c b/citadel/modules/xmpp/xmpp_sasl_service.c
index 968cef950025830a79e5491153be821a8d0b7a2b..ba6dba137446d4705e18a1db083e6e4a455f7478 100644 (file)
--- a/citadel/modules/xmpp/xmpp_sasl_service.c
+++ b/citadel/modules/xmpp/xmpp_sasl_service.c
@@ -154,7 +154,7 @@ void xmpp_sasl_auth(char *sasl_auth_mech, char *authstring) {
 /*
  * Non-SASL authentication
  */
-void xmpp_non_sasl_authenticate(char *iq_id, char *username, char *password, char *resource) {
+void xmpp_non_sasl_authenticate(StrBuf *IQ_id, char *username, char *password, char *resource) {
        int result;
 
         if (CC->logged_in) CtdlUserLogout();  /* Client may try to log in twice.  Handle this. */
@@ -163,18 +163,21 @@ void xmpp_non_sasl_authenticate(char *iq_id, char *username, char *password, cha
        if (result == login_ok) {
                result = CtdlTryPassword(password, strlen(password));
                if (result == pass_ok) {
-                       XPUT("<iq type=\"result\" id=\"");
-                       XPutProp(iq_id, strlen(iq_id));
-                       XPUT("\"></iq>"); /* success */
+                       XPrint(HKEY("iq"), XCLOSED,
+                              XCPROPERTY("type", "result"),
+                              XSPROPERTY("ID", IQ_id),
+                              TYPE_ARGEND);
+                              /* success */
                        return;
                }
        }
 
        /* failure */
-       XPUT("<iq type=\"error\" id=\"");
-       XPutProp(iq_id, strlen(iq_id));
-       XPUT("\">"
-            "<error code=\"401\" type=\"auth\">"
+       XPrint(HKEY("iq"), 0,
+              XCPROPERTY("type", "error"),
+              XSPROPERTY("ID", IQ_id),
+              TYPE_ARGEND);
+       XPUT("<error code=\"401\" type=\"auth\">"
             "<not-authorized xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\"/>"
             "</error>"
             "</iq>"