commit ab9f44f71e75a41986e8afce610cd446c5aaabac from: Omar Polo date: Wed Nov 23 14:44:48 2022 UTC kamiftp: deprecate -c it's useless as -C already implies it and -C must be use when connecting with TLS. To be definitely removed after 0.3. commit - df9bb54d629f5085f152e8d6d5f4d098a2adfba2 commit + ab9f44f71e75a41986e8afce610cd446c5aaabac blob - f18ce8bdca1bd2d26638738750cc0d127703c530 blob + 863312b75d27dd53f57e25328ada161d8dd9dbde --- kamiftp/ftp.c +++ kamiftp/ftp.c @@ -213,7 +213,7 @@ tty_resized(int signo) static void __dead usage(int ret) { - fprintf(stderr, "usage: %s [-c] [-C cert] [-K key] [-o output] " + fprintf(stderr, "usage: %s [-C cert] [-K key] [-o output] " "[user@]host[:port][/path]\n", getprogname()); fprintf(stderr, "kamid suite version " KAMID_VERSION "\n"); exit(ret); @@ -1692,7 +1692,7 @@ main(int argc, char **argv) tls = 1; crtpath = optarg; break; - case 'c': + case 'c': /* deprecated, remove after 0.3 */ tls = 1; break; case 'K': blob - 5706af0a53ea1fd8d42d9669743e84827544b93d blob + d366c74e27e27662accd63c85b5129a69c38c8c8 --- kamiftp/kamiftp.1 +++ kamiftp/kamiftp.1 @@ -20,7 +20,6 @@ .Nd 9p client .Sh SYNOPSIS .Nm -.Op Fl c .Op Fl C Ar cert .Op Fl K Ar key .Op Fl o Ar output @@ -39,17 +38,13 @@ remote working directory and starts accepting commands .Pp The options are as follows: .Bl -tag -width Ds -.It Fl c -Use TLS for the connection. If used, .Fl C is mandatory. .It Fl C Ar certificate -Specify the path to the client +Connect with TLS to the remote server and use the given .Ar certificate -to be use during the TLS handsahke. -Implies -.Fl c . +during the TLS handsahke. .It Fl K Ar key Specify the path to the client certificate .Ar key @@ -57,8 +52,9 @@ to be used during the TLS handshake. If not given, the file passed to .Fl C will be used. -Implies -.Fl c . +If used, +.Fl C +must be provided too. .It Fl o Ar output When fetching the file specified to the command line, save its content in