jrd/irssi
1
0
Fork 0
forked from PsychoticNinja/irssi
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1058 from ailin-nemui/sasl-reconnect

Browse Source 
copy sasl username and password values

(cherry picked from commit d23b0d22cc611e43c88d99192a59f413f951a955)
This commit is contained in:
ailin-nemui 2019-06-28 11:28:30 +02:00 committed by Ailin Nemui
parent 6b6e03c326
commit d0aa8af0d7
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/irc/core/irc-core.c
View File

@ -75,6 +75,8 @@ static void destroy_server_connect(SERVER_CONNECT_REC *conn)
g_free_not_null(ircconn->usermode); g_free_not_null(ircconn->usermode);
g_free_not_null(ircconn->alternate_nick); g_free_not_null(ircconn->alternate_nick);
g_free_not_null(ircconn->sasl_username);
g_free_not_null(ircconn->sasl_password);
} }
void irc_core_init(void) void irc_core_init(void)

4
src/irc/core/irc-servers-reconnect.c
View File

@ -49,8 +49,8 @@ static void sig_server_connect_copy(SERVER_CONNECT_REC **dest,
rec->usermode = g_strdup(src->usermode); rec->usermode = g_strdup(src->usermode);
rec->alternate_nick = g_strdup(src->alternate_nick); rec->alternate_nick = g_strdup(src->alternate_nick);
rec->sasl_mechanism = src->sasl_mechanism; rec->sasl_mechanism = src->sasl_mechanism;
rec->sasl_username = src->sasl_username; rec->sasl_username = g_strdup(src->sasl_username);
rec->sasl_password = src->sasl_password; rec->sasl_password = g_strdup(src->sasl_password);
*dest = (SERVER_CONNECT_REC *) rec; *dest = (SERVER_CONNECT_REC *) rec;
} }

4
src/irc/core/irc-servers-setup.c
View File

@ -101,8 +101,8 @@ static void sig_server_setup_fill_chatnet(IRC_SERVER_CONNECT_REC *conn,
if (ircnet->sasl_username != NULL && *ircnet->sasl_username && if (ircnet->sasl_username != NULL && *ircnet->sasl_username &&
ircnet->sasl_password != NULL && *ircnet->sasl_password) { ircnet->sasl_password != NULL && *ircnet->sasl_password) {
conn->sasl_mechanism = SASL_MECHANISM_PLAIN; conn->sasl_mechanism = SASL_MECHANISM_PLAIN;
conn->sasl_username = ircnet->sasl_username; conn->sasl_username = g_strdup(ircnet->sasl_username);
conn->sasl_password = ircnet->sasl_password; conn->sasl_password = g_strdup(ircnet->sasl_password);
} else } else
g_warning("The fields sasl_username and sasl_password are either missing or empty"); g_warning("The fields sasl_username and sasl_password are either missing or empty");
} }