Changes in protocols/jabber/sasl.c [71f87ba:8eb2e84]

File:

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

protocols/jabber/sasl.c

@@ -55 +55 @@
         char *s;
         int sup_plain = 0, sup_digest = 0, sup_gtalk = 0, sup_fb = 0;
-        int want_oauth = FALSE, want_hipchat = FALSE;
+        int want_oauth = FALSE;
         GString *mechs;
 
@@ -75 +75 @@
 
         want_oauth = set_getbool(&ic->acc->set, "oauth");
-        want_hipchat = (jd->flags & JFLAG_HIPCHAT);
 
         mechs = g_string_new("");
@@ -112 +111 @@
 
         reply = xt_new_node("auth", NULL, NULL);
-        if (!want_hipchat) {
-                xt_add_attr(reply, "xmlns", XMLNS_SASL);
-        } else {
-                xt_add_attr(reply, "xmlns", XMLNS_HIPCHAT);
-        }
+        xt_add_attr(reply, "xmlns", XMLNS_SASL);
 
         if (sup_gtalk && want_oauth) {
@@ -148 +143 @@
         } else if (sup_plain) {
                 int len;
-                GString *gs;
-                char *username;
-
-                if (!want_hipchat) {
-                        xt_add_attr(reply, "mechanism", "PLAIN");
-                        username = jd->username;
-                } else {
-                        username = jd->me;
-                }
-
-                /* set an arbitrary initial size to avoid reallocations */
-                gs = g_string_sized_new(128);
+
+                xt_add_attr(reply, "mechanism", "PLAIN");
 
                 /* With SASL PLAIN in XMPP, the text should be b64(\0user\0pass) */
-                g_string_append_c(gs, '\0');
-                g_string_append(gs, username);
-                g_string_append_c(gs, '\0');
-                g_string_append(gs, ic->acc->pass);
-                if (want_hipchat) {
-                        /* Hipchat's variation adds \0resource at the end */
-                        g_string_append_c(gs, '\0');
-                        g_string_append(gs, set_getstr(&ic->acc->set, "resource"));
-                }
-
-                len = gs->len;
-                s = g_string_free(gs, FALSE);
-
+                len = strlen(jd->username) + strlen(ic->acc->pass) + 2;
+                s = g_malloc(len + 1);
+                s[0] = 0;
+                strcpy(s + 1, jd->username);
+                strcpy(s + 2 + strlen(jd->username), ic->acc->pass);
                 reply->text = base64_encode((unsigned char *) s, len);
                 reply->text_len = strlen(reply->text);
@@ -420 +397 @@
                 imcb_log(ic, "Authentication finished");
                 jd->flags |= JFLAG_AUTHENTICATED | JFLAG_STREAM_RESTART;
-
-                if (jd->flags & JFLAG_HIPCHAT) {
-                        return hipchat_handle_success(ic, node);
-                }
         } else if (strcmp(node->name, "failure") == 0) {
                 imcb_error(ic, "Authentication failure");