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

diff --git a/citadel/modules/xmpp/xmpp_sasl_service.c b/citadel/modules/xmpp/xmpp_sasl_service.c
index da7637498..a6a6734f7 100644
--- a/citadel/modules/xmpp/xmpp_sasl_service.c
+++ b/citadel/modules/xmpp/xmpp_sasl_service.c
@@ -3,7 +3,7 @@
  *
  * Note: RFC3920 says we "must" support DIGEST-MD5 but we only support PLAIN.
  *
- * Copyright (c) 2007-2009 by Art Cancro
+ * Copyright (c) 2007-2018 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.
@@ -64,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));
@@ -80,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) {
@@ -111,6 +119,7 @@ void xmpp_output_auth_mechs(void) {
 	cprintf("</mechanisms>");
 }
 
+
 /*
  * Here we go ... client is trying to authenticate.
  */
@@ -123,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\">");
@@ -143,7 +154,6 @@ void xmpp_sasl_auth(char *sasl_auth_mech, char *authstring) {
 }
 
 
-
 /*
  * Non-SASL authentication
  */
@@ -151,9 +161,11 @@ 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) {