Changes in protocols/jabber/sasl.c [91dd19c:40cfbc5]

File:

• protocols/jabber/sasl.c (modified) (4 diffs)

protocols/jabber/sasl.c

@@ -54 +54 @@
         struct xt_node *c, *reply;
         char *s;
-        int sup_plain = 0, sup_digest = 0, sup_gtalk = 0, sup_fb = 0, sup_anonymous = 0;
-        int want_oauth = FALSE, want_hipchat = FALSE, want_anonymous = FALSE;
+        int sup_plain = 0, sup_digest = 0, sup_gtalk = 0, sup_fb = 0;
+        int want_oauth = FALSE, want_hipchat = FALSE;
         GString *mechs;
 
@@ -74 +74 @@
         }
 
-        want_anonymous = set_getbool(&ic->acc->set, "anonymous");
         want_oauth = set_getbool(&ic->acc->set, "oauth");
         want_hipchat = (jd->flags & JFLAG_HIPCHAT);
@@ -85 +84 @@
                 } else if (c->text && g_strcasecmp(c->text, "DIGEST-MD5") == 0) {
                         sup_digest = 1;
-                } else if (c->text && g_strcasecmp(c->text, "ANONYMOUS") == 0) {
-                        sup_anonymous = 1;
                 } else if (c->text && g_strcasecmp(c->text, "X-OAUTH2") == 0) {
                         sup_gtalk = 1;
@@ -145 +142 @@
                 xt_free_node(reply);
                 return XT_ABORT;
-        } else if (want_anonymous && sup_anonymous) {
-                xt_add_attr(reply, "mechanism", "ANONYMOUS");
-
-                /* Well, that was easy. */
-        } else if (want_anonymous) {
-                imcb_error(ic, "Anonymous login requested, but not supported by server");
-                imc_logout(ic, FALSE);
-                xt_free_node(reply);
-                return XT_ABORT;
-        } else if (sup_digest && !(jd->ssl && sup_plain)) {
-                /* Only try DIGEST-MD5 if there's no SSL/TLS or if PLAIN isn't supported.
-                 * Which in practice means "don't bother with DIGEST-MD5 most of the time".
-                 * It's weak, pointless over TLS, and often breaks with some servers (hi openfire) */
-
+        } else if (sup_digest) {
                 xt_add_attr(reply, "mechanism", "DIGEST-MD5");