Skip to content

Commit d23b0d2

Browse files
authored
Merge pull request #1058 from ailin-nemui/sasl-reconnect
copy sasl username and password values
2 parents d34bd85 + 5a67b98 commit d23b0d2

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

Diff for: src/irc/core/irc-core.c

+2
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ static void destroy_server_connect(SERVER_CONNECT_REC *conn)
7575

7676
g_free_not_null(ircconn->usermode);
7777
g_free_not_null(ircconn->alternate_nick);
78+
g_free_not_null(ircconn->sasl_username);
79+
g_free_not_null(ircconn->sasl_password);
7880
}
7981

8082
void irc_core_init(void)

Diff for: src/irc/core/irc-servers-reconnect.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ static void sig_server_connect_copy(SERVER_CONNECT_REC **dest,
4949
rec->usermode = g_strdup(src->usermode);
5050
rec->alternate_nick = g_strdup(src->alternate_nick);
5151
rec->sasl_mechanism = src->sasl_mechanism;
52-
rec->sasl_username = src->sasl_username;
53-
rec->sasl_password = src->sasl_password;
52+
rec->sasl_username = g_strdup(src->sasl_username);
53+
rec->sasl_password = g_strdup(src->sasl_password);
5454
*dest = (SERVER_CONNECT_REC *) rec;
5555
}
5656

Diff for: src/irc/core/irc-servers-setup.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ static void sig_server_setup_fill_chatnet(IRC_SERVER_CONNECT_REC *conn,
101101
conn->sasl_mechanism = SASL_MECHANISM_PLAIN;
102102
if (ircnet->sasl_username != NULL && *ircnet->sasl_username &&
103103
ircnet->sasl_password != NULL && *ircnet->sasl_password) {
104-
conn->sasl_username = ircnet->sasl_username;
105-
conn->sasl_password = ircnet->sasl_password;
104+
conn->sasl_username = g_strdup(ircnet->sasl_username);
105+
conn->sasl_password = g_strdup(ircnet->sasl_password);
106106
} else
107107
g_warning("The fields sasl_username and sasl_password are either missing or empty");
108108
}

0 commit comments

Comments
 (0)