stable now but there are GIANT PIECES MISSING

[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 78e05eebe0374bb465be61612623adbe9991cdc8..bb31ddaba299242de58b9059fc35481022e0a29b 100644 (file)
--- 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-2018 by Art Cancro
+ * Copyright (c) 2007-2019 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.
@@ -23,18 +23,7 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
+#include <time.h>
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
@@ -63,7 +52,6 @@ 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));
@@ -72,25 +60,9 @@ int xmpp_auth_plain(char *authstring)
        safestrncpy(ident, decoded_authstring, sizeof ident);
        safestrncpy(user, &decoded_authstring[strlen(ident) + 1], sizeof user);
        len = safestrncpy(pass, &decoded_authstring[strlen(ident) + strlen(user) + 2], sizeof pass);
-       if (len < 0)
+       if (len < 0) {
                len = -len;
-
-       /* If there are underscores in either string, change them to spaces.  Some clients
-        * do not allow spaces so we can tell the user to substitute underscores if their
-        * login name contains spaces.
-        */
-       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(ident);