]> jfr.im git - irc/hexchat/hexchat.git/commitdiff
Consistently set the SSL state in /reconnect.
authorSadie Powell <redacted>
Mon, 31 May 2021 00:11:19 +0000 (01:11 +0100)
committerPatrick <redacted>
Fri, 18 Jun 2021 00:47:34 +0000 (19:47 -0500)
We need to use a temporary variable here as we're overwriting the
existing server object which may have values set here already.

src/common/outbound.c

index 0248a58d574f62db54bec5f7fd0e6325769222f0..c39a1d46959301599e697fed9877b4baec69f390 100644 (file)
@@ -3227,17 +3227,21 @@ cmd_reconnect (struct session *sess, char *tbuf, char *word[], char *word_eol[])
                int offset = 0;
 
 #ifdef USE_OPENSSL
+               int use_ssl = FALSE;
+               int use_ssl_noverify = FALSE;
                if (g_strcmp0 (word[2], "-ssl") == 0)
                {
-                       serv->use_ssl = TRUE;
-                       serv->accept_invalid_cert = FALSE;
+                       use_ssl = TRUE;
+                       use_ssl_noverify = FALSE;
                        offset++;       /* args move up by 1 word */
                } else if (g_strcmp0 (word[2], "-ssl-noverify") == 0)
                {
-                       serv->use_ssl = TRUE;
-                       serv->accept_invalid_cert = TRUE;
+                       use_ssl = TRUE;
+                       use_ssl_noverify = TRUE;
                        offset++;       /* args move up by 1 word */
                }
+               serv->use_ssl = use_ssl;
+               serv->accept_invalid_cert = use_ssl_noverify;
 #endif
 
                if (*word[4+offset])