Merge branch 'develop'

3 files changed, 19 insertions, 4 deletions

diff --git a/protocols/jabber/jabber.c b/protocols/jabber/jabber.c
index 431b3e54..38fb4966 100644
--- a/protocols/jabber/jabber.c
+++ b/protocols/jabber/jabber.c
@@ -84,7 +84,10 @@ static void jabber_init(account_t *acc)
 	if (strcmp(acc->prpl->name, "hipchat") == 0) {
 		set_setstr(&acc->set, "server", "chat.hipchat.com");
 	} else {
-		s = set_add(&acc->set, "oauth", "false", set_eval_oauth, acc);
+		set_add(&acc->set, "oauth", "false", set_eval_oauth, acc);
+
+		/* this reuses set_eval_oauth, which clears the password */
+		set_add(&acc->set, "anonymous", "false", set_eval_oauth, acc);
 	}
 
 	s = set_add(&acc->set, "ssl", "false", set_eval_bool, acc);
diff --git a/protocols/jabber/s5bytestream.c b/protocols/jabber/s5bytestream.c
index 60d522e4..f9f9d2e1 100644
--- a/protocols/jabber/s5bytestream.c
+++ b/protocols/jabber/s5bytestream.c
@@ -84,7 +84,7 @@ char *socks5_reply_code[] = {
 	if ((op) == -1) { \
 		return jabber_bs_abort(bt, msg ": %s", strerror(errno)); }
 
-gboolean jabber_bs_abort(struct bs_transfer *bt, char *format, ...);
+gboolean jabber_bs_abort(struct bs_transfer *bt, char *format, ...) G_GNUC_PRINTF(2, 3);
 void jabber_bs_canceled(file_transfer_t *ft, char *reason);
 void jabber_bs_free_transfer(file_transfer_t *ft);
 gboolean jabber_bs_connect_timeout(gpointer data, gint fd, b_input_condition cond);
diff --git a/protocols/jabber/sasl.c b/protocols/jabber/sasl.c
index 45d52593..beb53fdd 100644
--- a/protocols/jabber/sasl.c
+++ b/protocols/jabber/sasl.c
@@ -53,8 +53,8 @@ xt_status sasl_pkt_mechanisms(struct xt_node *node, gpointer data)
 	struct jabber_data *jd = ic->proto_data;
 	struct xt_node *c, *reply;
 	char *s;
-	int sup_plain = 0, sup_digest = 0, sup_gtalk = 0, sup_fb = 0;
-	int want_oauth = FALSE, want_hipchat = FALSE;
+	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;
 	GString *mechs;
 
 	if (!sasl_supported(ic)) {
@@ -73,6 +73,7 @@ xt_status sasl_pkt_mechanisms(struct xt_node *node, gpointer data)
 		return XT_ABORT;
 	}
 
+	want_anonymous = set_getbool(&ic->acc->set, "anonymous");
 	want_oauth = set_getbool(&ic->acc->set, "oauth");
 	want_hipchat = (jd->flags & JFLAG_HIPCHAT);
 
@@ -83,6 +84,8 @@ xt_status sasl_pkt_mechanisms(struct xt_node *node, gpointer data)
 			sup_plain = 1;
 		} 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;
 		} else if (c->text && g_strcasecmp(c->text, "X-FACEBOOK-PLATFORM") == 0) {
@@ -141,6 +144,15 @@ xt_status sasl_pkt_mechanisms(struct xt_node *node, gpointer data)
 		imc_logout(ic, FALSE);
 		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) {
 		xt_add_attr(reply, "mechanism", "DIGEST-MD5");