diff options
author | James Booth <boothj5@gmail.com> | 2017-07-13 22:28:32 +0100 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2017-07-13 22:28:32 +0100 |
commit | fc42e157899ce2905d367dc7b0d33520968f37ef (patch) | |
tree | 0fd5350af18fed49e3200562d0fd5872365f9143 /src/command/cmd_defs.c | |
parent | ca4d8cbcf53f5d2666b87f8c1b23b3fec806927d (diff) | |
parent | 1012e11283da1bfae56e8ba9261473b670767d46 (diff) | |
download | profani-tty-fc42e157899ce2905d367dc7b0d33520968f37ef.tar.gz |
Merge remote-tracking branch 'pasis/legacy-ssl'
Diffstat (limited to 'src/command/cmd_defs.c')
-rw-r--r-- | src/command/cmd_defs.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/command/cmd_defs.c b/src/command/cmd_defs.c index 37ae0442..c760d47c 100644 --- a/src/command/cmd_defs.c +++ b/src/command/cmd_defs.c @@ -158,7 +158,7 @@ static struct cmd_t command_defs[] = CMD_TAG_CONNECTION) CMD_SYN( "/connect [<account>]", - "/connect <account> [server <server>] [port <port>] [tls force|allow|disable]") + "/connect <account> [server <server>] [port <port>] [tls force|allow|legacy|disable]") CMD_DESC( "Login to a chat service. " "If no account is specified, the default is used if one is configured. " @@ -169,6 +169,7 @@ static struct cmd_t command_defs[] = { "port <port>", "The port to use if different to the default (5222, or 5223 for SSL)." }, { "tls force", "Force TLS connection, and fail if one cannot be established, this is default behaviour." }, { "tls allow", "Use TLS for the connection if it is available." }, + { "tls legacy", "Use legacy TLS for the connection. It means server doesn't support STARTTLS and TLS is forced just after TCP connection is established." }, { "tls disable", "Disable TLS for the connection." }) CMD_EXAMPLES( "/connect", @@ -1984,7 +1985,7 @@ static struct cmd_t command_defs[] = "/account set <account> otr <policy>", "/account set <account> pgpkeyid <pgpkeyid>", "/account set <account> startscript <script>", - "/account set <account> tls force|allow|disable", + "/account set <account> tls force|allow|legacy|disable", "/account set <account> theme <theme>", "/account clear <account> password", "/account clear <account> eval_password", @@ -2024,6 +2025,7 @@ static struct cmd_t command_defs[] = { "set <account> startscript <script>", "Set the script to execute after connecting." }, { "set <account> tls force", "Force TLS connection, and fail if one cannot be established, this is default behaviour." }, { "set <account> tls allow", "Use TLS for the connection if it is available." }, + { "set <account> tls legacy", "Use legacy TLS for the connection. It means server doesn't support STARTTLS and TLS is forced just after TCP connection is established." }, { "set <account> tls disable", "Disable TLS for the connection." }, { "set <account> <theme>", "Set the UI theme for the account." }, { "clear <account> server", "Remove the server setting for this account." }, |