X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmodules%2Fxmpp%2Fxmpp_sasl_service.c;h=da76374987a8a1e81fa377d3a4207072f622a421;hp=fd4986137b1fa28ad484dd31f0f1cf726702bea9;hb=2976b35710982e72d499db16d648eee7b2cfaa94;hpb=bb47b9c23a29dee2a8d801655a237ec50078b348

diff --git a/citadel/modules/xmpp/xmpp_sasl_service.c b/citadel/modules/xmpp/xmpp_sasl_service.c
index fd4986137..da7637498 100644
--- a/citadel/modules/xmpp/xmpp_sasl_service.c
+++ b/citadel/modules/xmpp/xmpp_sasl_service.c
@@ -5,20 +5,13 @@
  *
  * Copyright (c) 2007-2009 by Art Cancro
  *
- *  This program is open source software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 3.
- *  
- *  
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  
- *  
- *  
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3.
  *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  */
 
 #include "sysdep.h"
@@ -113,9 +106,9 @@ int xmpp_auth_plain(char *authstring)
  * Output the list of SASL mechanisms offered by this stream.
  */
 void xmpp_output_auth_mechs(void) {
-	XPUT("<mechanisms xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\">"
-	     "<mechanism>PLAIN</mechanism>"
-	     "</mechanisms>");
+	cprintf("<mechanisms xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\">");
+	cprintf("<mechanism>PLAIN</mechanism>");
+	cprintf("</mechanisms>");
 }
 
 /*
@@ -124,28 +117,28 @@ void xmpp_output_auth_mechs(void) {
 void xmpp_sasl_auth(char *sasl_auth_mech, char *authstring) {
 
 	if (strcasecmp(sasl_auth_mech, "PLAIN")) {
-		XPUT("<failure xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\">"
-		     "<invalid-mechanism/>"
-		     "</failure>");
+		cprintf("<failure xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\">");
+		cprintf("<invalid-mechanism/>");
+		cprintf("</failure>");
 		return;
 	}
 
         if (CC->logged_in) CtdlUserLogout();  /* Client may try to log in twice.  Handle this. */
 
 	if (CC->nologin) {
-		XPUT("<failure xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\">"
-		     "<system-shutdown/>"
-		     "</failure>");
+		cprintf("<failure xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\">");
+		cprintf("<system-shutdown/>");
+		cprintf("</failure>");
 	}
 
 	else if (xmpp_auth_plain(authstring) == 0) {
-		XPUT("<success xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\"/>");
+		cprintf("<success xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\"/>");
 	}
 
 	else {
-		XPUT("<failure xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\">"
-		     "<not-authorized/>"
-		     "</failure>");
+		cprintf("<failure xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\">");
+		cprintf("<not-authorized/>");
+		cprintf("</failure>");
 	}
 }
 
@@ -154,8 +147,9 @@ 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(char *iq_id, char *username, char *password) {
 	int result;
+	char xmlbuf[256];
 
         if (CC->logged_in) CtdlUserLogout();  /* Client may try to log in twice.  Handle this. */
 
@@ -163,23 +157,16 @@ 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) {
-			XPrint(HKEY("iq"), XCLOSED,
-			       XCPROPERTY("type", "result"),
-			       XPROPERTY("ID", iq_id, strlen(iq_id)),
-			       TYPE_ARGEND);
-			       /* success */
+			cprintf("<iq type=\"result\" id=\"%s\"></iq>", xmlesc(xmlbuf, iq_id, sizeof xmlbuf));	/* success */
 			return;
 		}
 	}
 
 	/* failure */
-	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>"
+	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>"
 	);
 }