XMPP: Cleanup

[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 aee8bb7576457f7d793c7b67e1f7c885177622ba..968cef950025830a79e5491153be821a8d0b7a2b 100644 (file)
--- a/citadel/modules/xmpp/xmpp_sasl_service.c
+++ b/citadel/modules/xmpp/xmpp_sasl_service.c
@@ -1,25 +1,23 @@
 /*
- * $Id$ 
- *
  * Barebones SASL authentication service for XMPP (Jabber) clients.
  *
  * Note: RFC3920 says we "must" support DIGEST-MD5 but we only support PLAIN.
  *
  * Copyright (c) 2007-2009 by Art Cancro
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
+ *  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.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  
+ *  
+ *  
  *
  */
 
@@ -115,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>");
 }
 
 /*
@@ -126,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>");
        }
 }
 
@@ -158,7 +156,6 @@ void xmpp_sasl_auth(char *sasl_auth_mech, char *authstring) {
  */
 void xmpp_non_sasl_authenticate(char *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. */
 
@@ -166,16 +163,20 @@ 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 */
+                       XPUT("<iq type=\"result\" id=\"");
+                       XPutProp(iq_id, strlen(iq_id));
+                       XPUT("\"></iq>"); /* 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>"
+       XPUT("<iq type=\"error\" id=\"");
+       XPutProp(iq_id, strlen(iq_id));
+       XPUT("\">"
+            "<error code=\"401\" type=\"auth\">"
+            "<not-authorized xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\"/>"
+            "</error>"
+            "</iq>"
        );
 }