cosmetic cleanup of files in xmpp directory

[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..a6a6734f7db004042010f6cb506d48267e1defd5 100644 (file)
--- a/citadel/modules/xmpp/xmpp_sasl_service.c
+++ b/citadel/modules/xmpp/xmpp_sasl_service.c
@@ -1,26 +1,17 @@
 /*
- * $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 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.
+ * Copyright (c) 2007-2018 by Art Cancro
  *
- *  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
+ * 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"
@@ -73,7 +64,7 @@ int xmpp_auth_plain(char *authstring)
        char pass[256];
        int result;
        long len;
-
+       int i;
 
        /* Take apart the authentication string */
        memset(pass, 0, sizeof(pass));
@@ -89,16 +80,24 @@ int xmpp_auth_plain(char *authstring)
         * do not allow spaces so we can tell the user to substitute underscores if their
         * login name contains spaces.
         */
-       convert_spaces_to_underscores(ident);
-       convert_spaces_to_underscores(user);
+       for (i=0; ident[i]!=0; ++i) {
+               if (ident[i] == '_') {
+                       ident[i] = ' ';
+               }
+       }
+       for (i=0; user[i]!=0; ++i) {
+               if (user[i] == '_') {
+                       user[i] = ' ';
+               }
+       }
 
        /* Now attempt authentication */
 
        if (!IsEmptyStr(ident)) {
-               result = CtdlLoginExistingUser(user, ident);
+               result = CtdlLoginExistingUser(ident);
        }
        else {
-               result = CtdlLoginExistingUser(NULL, user);
+               result = CtdlLoginExistingUser(user);
        }
 
        if (result == login_ok) {
@@ -120,6 +119,7 @@ void xmpp_output_auth_mechs(void) {
        cprintf("</mechanisms>");
 }
 
+
 /*
  * Here we go ... client is trying to authenticate.
  */
@@ -132,7 +132,9 @@ void xmpp_sasl_auth(char *sasl_auth_mech, char *authstring) {
                return;
        }
 
-        if (CC->logged_in) CtdlUserLogout();  /* Client may try to log in twice.  Handle this. */
+        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\">");
@@ -152,17 +154,18 @@ 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. */
+        if (CC->logged_in) {
+               CtdlUserLogout();  /* Client may try to log in twice.  Handle this. */
+       }
 
-       result = CtdlLoginExistingUser(NULL, username);
+       result = CtdlLoginExistingUser(username);
        if (result == login_ok) {
                result = CtdlTryPassword(password, strlen(password));
                if (result == pass_ok) {