comparison libpurple/protocols/simple/simple.c @ 20589:5723dbc6212d

Clear the password consistently when we get a "Signed-On elsewhere" or a "Invalid Password" disconnection. Disconnection reason codes will take care of this in the core, but until then, this is ok. Fixes #3204.

20588:e23a1585d822

}

static void do_register_exp(struct simple_account_data *sip, int expire) {
	char *uri, *to, *contact, *hdr;

	/* Set our default expiration to 900, 
	 * as done in the initialization of the simple_account_data
	 * structure.
	 */
	if (!expire)
		expire = 900;

			if(sip->registerstatus != SIMPLE_REGISTER_RETRY) {
				purple_debug_info("simple", "REGISTER retries %d\n", sip->registrar.retries);
				if(sip->registrar.retries > SIMPLE_REGISTER_RETRY_MAX) {
					purple_debug_info("simple", "Setting wants_to_die to true.\n");
					sip->gc->wants_to_die = TRUE;
					purple_connection_error(sip->gc, _("Incorrect password."));
					return TRUE;
				}
				tmp = sipmsg_find_header(msg, "WWW-Authenticate");
				fill_auth(sip, tmp, &sip->registrar);

20589:5723dbc6212d

}

static void do_register_exp(struct simple_account_data *sip, int expire) {
	char *uri, *to, *contact, *hdr;

	/* Set our default expiration to 900,
	 * as done in the initialization of the simple_account_data
	 * structure.
	 */
	if (!expire)
		expire = 900;

			if(sip->registerstatus != SIMPLE_REGISTER_RETRY) {
				purple_debug_info("simple", "REGISTER retries %d\n", sip->registrar.retries);
				if(sip->registrar.retries > SIMPLE_REGISTER_RETRY_MAX) {
					purple_debug_info("simple", "Setting wants_to_die to true.\n");
					sip->gc->wants_to_die = TRUE;
					if (!purple_account_get_remember_password(sip->gc->account))
						purple_account_set_password(sip->gc->account, NULL);
					purple_connection_error(sip->gc, _("Incorrect password."));
					return TRUE;
				}
				tmp = sipmsg_find_header(msg, "WWW-Authenticate");
				fill_auth(sip, tmp, &sip->registrar);