libical, expat, and libsieve are now *required*.

[citadel.git] / citadel / modules / jabber / xmpp_sasl_service.c

diff --git a/citadel/modules/jabber/xmpp_sasl_service.c b/citadel/modules/jabber/xmpp_sasl_service.c
index f444ba9b9da232c5cdd87a6ef6444a2f3b333088..8a32aee22058d8a6bf1661fd96a79a991d57ef7b 100644 (file)
--- a/citadel/modules/jabber/xmpp_sasl_service.c
+++ b/citadel/modules/jabber/xmpp_sasl_service.c
@@ -35,6 +35,7 @@
 #include <string.h>
 #include <limits.h>
 #include <ctype.h>
+#include <expat.h>
 #include <libcitadel.h>
 #include "citadel.h"
 #include "server.h"
@@ -45,9 +46,6 @@
 #include "internet_addressing.h"
 #include "md5.h"
 #include "ctdl_module.h"
-
-#ifdef HAVE_EXPAT
-#include <expat.h>
 #include "serv_xmpp.h"
 
 
@@ -76,13 +74,8 @@ 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.
         */
-       while (ptr=strstr(ident, "_")) {
-               *ptr = ' ';
-       }
-
-       while (ptr=strstr(user, "_")) {
-               *ptr = ' ';
-       }
+       convert_spaces_to_underscores(ident);
+       convert_spaces_to_underscores(user);
 
        /* Now attempt authentication */
 
@@ -164,7 +157,3 @@ void jabber_non_sasl_authenticate(char *iq_id, char *username, char *password, c
                "</iq>"
        );
 }
-
-
-
-#endif /* HAVE_EXPAT */