- Timestamp:
- 2015-07-04T21:25:16Z (9 years ago)
- Branches:
- master
- Children:
- 3ddbd23c, adec749
- Parents:
- 632a232
- Location:
- protocols/jabber
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
protocols/jabber/jabber.c
r632a232 r73dd021 85 85 set_setstr(&acc->set, "server", "chat.hipchat.com"); 86 86 } else { 87 s = set_add(&acc->set, "oauth", "false", set_eval_oauth, acc); 87 set_add(&acc->set, "oauth", "false", set_eval_oauth, acc); 88 89 /* this reuses set_eval_oauth, which clears the password */ 90 set_add(&acc->set, "anonymous", "false", set_eval_oauth, acc); 88 91 } 89 92 -
protocols/jabber/sasl.c
r632a232 r73dd021 54 54 struct xt_node *c, *reply; 55 55 char *s; 56 int sup_plain = 0, sup_digest = 0, sup_gtalk = 0, sup_fb = 0 ;57 int want_oauth = FALSE, want_hipchat = FALSE ;56 int sup_plain = 0, sup_digest = 0, sup_gtalk = 0, sup_fb = 0, sup_anonymous = 0; 57 int want_oauth = FALSE, want_hipchat = FALSE, want_anonymous = FALSE; 58 58 GString *mechs; 59 59 … … 74 74 } 75 75 76 want_anonymous = set_getbool(&ic->acc->set, "anonymous"); 76 77 want_oauth = set_getbool(&ic->acc->set, "oauth"); 77 78 want_hipchat = (jd->flags & JFLAG_HIPCHAT); … … 84 85 } else if (c->text && g_strcasecmp(c->text, "DIGEST-MD5") == 0) { 85 86 sup_digest = 1; 87 } else if (c->text && g_strcasecmp(c->text, "ANONYMOUS") == 0) { 88 sup_anonymous = 1; 86 89 } else if (c->text && g_strcasecmp(c->text, "X-OAUTH2") == 0) { 87 90 sup_gtalk = 1; … … 139 142 } else if (want_oauth) { 140 143 imcb_error(ic, "OAuth requested, but not supported by server"); 144 imc_logout(ic, FALSE); 145 xt_free_node(reply); 146 return XT_ABORT; 147 } else if (want_anonymous && sup_anonymous) { 148 xt_add_attr(reply, "mechanism", "ANONYMOUS"); 149 150 /* Well, that was easy. */ 151 } else if (want_anonymous) { 152 imcb_error(ic, "Anonymous login requested, but not supported by server"); 141 153 imc_logout(ic, FALSE); 142 154 xt_free_node(reply);
Note: See TracChangeset
for help on using the changeset viewer.