aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-11-03 04:27:19 -05:00
Code

do not unconditionally enable tls on /connect -!

Browse Source
This commit is contained in:
Ailin Nemui 2021-08-31 17:29:43 +02:00
parent b7b91ed2bf
commit 21701a1299
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/servers-setup.c
View File

@ -191,8 +191,10 @@ static void server_setup_fill_optlist(SERVER_CONNECT_REC *conn, GHashTable *optl
/* ad-hoc TLS settings from command optlist */ /* ad-hoc TLS settings from command optlist */
if ((tmp = g_hash_table_lookup(optlist, "tls_cert")) != NULL || if ((tmp = g_hash_table_lookup(optlist, "tls_cert")) != NULL ||
(tmp = g_hash_table_lookup(optlist, "ssl_cert")) != NULL) (tmp = g_hash_table_lookup(optlist, "ssl_cert")) != NULL) {
conn->tls_cert = g_strdup(tmp); conn->tls_cert = g_strdup(tmp);
conn->use_tls = TRUE;
}
if ((tmp = g_hash_table_lookup(optlist, "tls_pkey")) != NULL || if ((tmp = g_hash_table_lookup(optlist, "tls_pkey")) != NULL ||
(tmp = g_hash_table_lookup(optlist, "ssl_pkey")) != NULL) (tmp = g_hash_table_lookup(optlist, "ssl_pkey")) != NULL)
conn->tls_pkey = g_strdup(tmp); conn->tls_pkey = g_strdup(tmp);
@ -220,10 +222,10 @@ static void server_setup_fill_optlist(SERVER_CONNECT_REC *conn, GHashTable *optl
if (g_hash_table_lookup(optlist, "notls_verify") != NULL) if (g_hash_table_lookup(optlist, "notls_verify") != NULL)
conn->tls_verify = FALSE; conn->tls_verify = FALSE;
if (g_hash_table_lookup(optlist, "tls_verify") != NULL || if (g_hash_table_lookup(optlist, "tls_verify") != NULL ||
g_hash_table_lookup(optlist, "ssl_verify") != NULL) g_hash_table_lookup(optlist, "ssl_verify") != NULL) {
conn->tls_verify = TRUE; conn->tls_verify = TRUE;
if ((conn->tls_cert != NULL && conn->tls_cert[0] != '\0') || conn->tls_verify)
conn->use_tls = TRUE; conn->use_tls = TRUE;
}
if (g_hash_table_lookup(optlist, "notls") != NULL) if (g_hash_table_lookup(optlist, "notls") != NULL)
conn->use_tls = FALSE; conn->use_tls = FALSE;
if (g_hash_table_lookup(optlist, "tls") != NULL || if (g_hash_table_lookup(optlist, "tls") != NULL ||