X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmodules%2Fxmpp%2Fxmpp_sasl_service.c;fp=citadel%2Fmodules%2Fxmpp%2Fxmpp_sasl_service.c;h=fd4986137b1fa28ad484dd31f0f1cf726702bea9;hp=968cef950025830a79e5491153be821a8d0b7a2b;hb=bb47b9c23a29dee2a8d801655a237ec50078b348;hpb=57231d9bfac327b0754787f097be79bc83cf24c6

diff --git a/citadel/modules/xmpp/xmpp_sasl_service.c b/citadel/modules/xmpp/xmpp_sasl_service.c
index 968cef950..fd4986137 100644
--- a/citadel/modules/xmpp/xmpp_sasl_service.c
+++ b/citadel/modules/xmpp/xmpp_sasl_service.c
@@ -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"),
+			       XPROPERTY("ID", iq_id, strlen(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"),
+	       XPROPERTY("ID", iq_id, strlen(iq_id)),
+	       TYPE_ARGEND);
+	XPUT("<error code=\"401\" type=\"auth\">"
 	     "<not-authorized xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\"/>"
 	     "</error>"
 	     "</iq>"