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=ba6dba137446d4705e18a1db083e6e4a455f7478;hp=393174dce18b2cf78901e61aa1955743d84f08fc;hb=6ae0819ac13984a0dfa583281fc0081af735c77d;hpb=1aa2da0249792527f99172681aecc77e0ad086af

diff --git a/citadel/modules/xmpp/xmpp_sasl_service.c b/citadel/modules/xmpp/xmpp_sasl_service.c
index 393174dce..ba6dba137 100644
--- a/citadel/modules/xmpp/xmpp_sasl_service.c
+++ b/citadel/modules/xmpp/xmpp_sasl_service.c
@@ -113,9 +113,9 @@ int xmpp_auth_plain(char *authstring)
  * Output the list of SASL mechanisms offered by this stream.
  */
 void xmpp_output_auth_mechs(void) {
-	cprintf("<mechanisms xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\">");
-	cprintf("<mechanism>PLAIN</mechanism>");
-	cprintf("</mechanisms>");
+	XPUT("<mechanisms xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\">"
+	     "<mechanism>PLAIN</mechanism>"
+	     "</mechanisms>");
 }
 
 /*
@@ -124,28 +124,28 @@ void xmpp_output_auth_mechs(void) {
 void xmpp_sasl_auth(char *sasl_auth_mech, char *authstring) {
 
 	if (strcasecmp(sasl_auth_mech, "PLAIN")) {
-		cprintf("<failure xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\">");
-		cprintf("<invalid-mechanism/>");
-		cprintf("</failure>");
+		XPUT("<failure xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\">"
+		     "<invalid-mechanism/>"
+		     "</failure>");
 		return;
 	}
 
         if (CC->logged_in) CtdlUserLogout();  /* Client may try to log in twice.  Handle this. */
 
 	if (CC->nologin) {
-		cprintf("<failure xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\">");
-		cprintf("<system-shutdown/>");
-		cprintf("</failure>");
+		XPUT("<failure xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\">"
+		     "<system-shutdown/>"
+		     "</failure>");
 	}
 
 	else if (xmpp_auth_plain(authstring) == 0) {
-		cprintf("<success xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\"/>");
+		XPUT("<success xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\"/>");
 	}
 
 	else {
-		cprintf("<failure xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\">");
-		cprintf("<not-authorized/>");
-		cprintf("</failure>");
+		XPUT("<failure xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\">"
+		     "<not-authorized/>"
+		     "</failure>");
 	}
 }
 
@@ -154,9 +154,8 @@ 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;
-	char xmlbuf[256];
 
         if (CC->logged_in) CtdlUserLogout();  /* Client may try to log in twice.  Handle this. */
 
@@ -164,16 +163,23 @@ 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) {
-			cprintf("<iq type=\"result\" id=\"%s\"></iq>", xmlesc(xmlbuf, iq_id, sizeof xmlbuf));	/* success */
+			XPrint(HKEY("iq"), XCLOSED,
+			       XCPROPERTY("type", "result"),
+			       XSPROPERTY("ID", IQ_id),
+			       TYPE_ARGEND);
+			       /* success */
 			return;
 		}
 	}
 
 	/* failure */
-	cprintf("<iq type=\"error\" id=\"%s\">", xmlesc(xmlbuf, iq_id, sizeof xmlbuf));
-	cprintf("<error code=\"401\" type=\"auth\">"
-		"<not-authorized xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\"/>"
-		"</error>"
-		"</iq>"
+	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>"
 	);
 }