From 7145e1ef20957c6aab6b9109108accadebc31c64 Mon Sep 17 00:00:00 2001 From: ailin-nemui Date: Sat, 9 Sep 2023 11:00:37 +0000 Subject: [PATCH] Merge pull request #1494 from RealKindOne/master Add -notls and -notls_verify into help file and src/core/chat-commands.c (cherry picked from commit e7f1268478dc07e356e7fc0d79b3f810f4d05e8f) --- docs/help/in/server.in | 4 +++- src/core/chat-commands.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/help/in/server.in b/docs/help/in/server.in index 47b2d524..84b5ad78 100644 --- a/docs/help/in/server.in +++ b/docs/help/in/server.in @@ -16,11 +16,13 @@ -4: Connects using IPv4. -6: Connects using IPv6. -tls: Connects using TLS encryption. + -notls: Connect without TLS encrption. -tls_cert: The TLS client certificate file. -tls_pkey: The TLS client private key, if not included in the certificate file. -tls_pass: The password for the TLS client private key or certificate. - -tls_verify: Verifies the TLS certificate of the server. + -tls_verify: Verifies the TLS certificate of the server. + -notls_verify: Doesn't verify the TLS certificate of the server. -tls_cafile: The file with the list of CA certificates. -tls_capath: The directory which contains the CA certificates. -tls_ciphers: TLS cipher suite preference lists. diff --git a/src/core/chat-commands.c b/src/core/chat-commands.c index a88a27ab..faeec451 100644 --- a/src/core/chat-commands.c +++ b/src/core/chat-commands.c @@ -211,8 +211,8 @@ static void cmd_server(const char *data, SERVER_REC *server, WI_ITEM_REC *item) command_runsub("server", data, server, item); } -/* SYNTAX: SERVER CONNECT [-4 | -6] [-tls] [-tls_cert ] [-tls_pkey ] - [-tls_pass ] [-tls_verify] [-tls_cafile ] +/* SYNTAX: SERVER CONNECT [-4 | -6] [-tls | -notls] [-tls_cert ] [-tls_pkey ] + [-tls_pass ] [-tls_verify | -notls_verify] [-tls_cafile ] [-tls_capath ] [-tls_ciphers ] [-tls_pinned_cert ] [-tls_pinned_pubkey ] [-!] [-noautosendcmd] [-nocap]