deepend/zoitechat
1
0
Fork 0
mirror of https://github.com/ZoiteChat/zoitechat.git synced 2026-03-13 17:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Built-in SASL support and other CAP fixes

Browse Source
This commit is contained in:
Berke Viktor
2012-10-25 16:17:21 +02:00
parent 47310229a4
commit 4f4958878a
5 changed files with 89 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/common/servlist.c
View File

@@ -608,13 +608,33 @@ servlist_connect (session *sess, ircnet *net, gboolean join)
}
serv->password[0] = 0;
serv->sasluser[0] = 0;
serv->saslpassword[0] = 0;
if (net->pass)
{
safe_strcpy (serv->password, net->pass, sizeof (serv->password));
}
if (net->flags & FLAG_USE_GLOBAL)
{
strcpy (serv->sasluser, prefs.hex_irc_user_name);
}
else
{
safe_strcpy (serv->sasluser, net->user, sizeof (serv->sasluser));
}
if (net->saslpass)
{
safe_strcpy (serv->saslpassword, net->saslpass, sizeof (serv->saslpassword));
}
if (net->flags & FLAG_USE_GLOBAL)
{
strcpy (serv->nick, prefs.hex_irc_nick1);
} else
}
else
{
if (net->nick)
strcpy (serv->nick, net->nick);
@@ -901,6 +921,7 @@ servlist_cleanup (void)
{
net = list->data;
free_and_clear (net->pass);
free_and_clear (net->saslpass);
free_and_clear (net->nickserv);
}
}
@@ -923,6 +944,7 @@ servlist_net_remove (ircnet *net)
if (net->real)
free (net->real);
free_and_clear (net->pass);
free_and_clear (net->saslpass);
if (net->autojoin)
free (net->autojoin);
if (net->command)
@@ -1035,6 +1057,9 @@ servlist_load (void)
case 'P':
net->pass = strdup (buf + 2);
break;
case 'A':
net->saslpass = strdup (buf + 2);
break;
case 'J':
net->autojoin = strdup (buf + 2);
break;
@@ -1166,6 +1191,8 @@ servlist_save (void)
fprintf (fp, "R=%s\n", net->real);
if (net->pass)
fprintf (fp, "P=%s\n", net->pass);
if (net->saslpass)
fprintf (fp, "A=%s\n", net->saslpass);
if (net->autojoin)
fprintf (fp, "J=%s\n", net->autojoin);
if (net->nickserv)