SoniEx2
/
c.sexchat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add code for migrating existing configs

This commit is contained in:
Berke Viktor 2013-05-12 16:38:21 +02:00
parent cadcfc553c
commit aac7079562
1 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/common/servlist.c
View File

@ -661,7 +661,7 @@ servlist_connect (session *sess, ircnet *net, gboolean join)
} }
else else
{ {
serv->loginmethod = 2; /* use /NickServ by default */ serv->loginmethod = 7; /* Use server password by default. If we had a NickServ password, it'd be set to 2 already. */
} }
serv->password[0] = 0; serv->password[0] = 0;
@ -1248,6 +1248,34 @@ servlist_load (void)
case 'D': case 'D':
net->selected = atoi (buf + 2); net->selected = atoi (buf + 2);
break; break;
/* FIXME Migration code. In 2.9.5 the order was:
*
* P=serverpass, A=saslpass, B=nickservpass
*
* So if server password was unset, we can safely use SASL
* password for our new universal password, or if that's also
* unset, use NickServ password.
*
* Should be removed at some point.
*/
case 'A':
if (!net->pass)
{
net->pass = strdup (buf + 2);
if (!net->logintype)
{
net->logintype = 6;
}
}
case 'B':
if (!net->pass)
{
net->pass = strdup (buf + 2);
if (!net->logintype)
{
net->logintype = 2;
}
}
} }
} }
if (buf[0] == 'N') if (buf[0] == 'N')