Update command-line help and man pages for -hostkey.

[originally from svn r10229]

diff --git a/doc/man-pl.but b/doc/man-pl.but
index 2e3013c5bd725229ffbad069bb1a2d74523c3311..b5c64dc9c2eeed64b6798575daa9de68966cb323 100644 (file)
--- a/doc/man-pl.but
+++ b/doc/man-pl.but
@@ -139,7 +139,17 @@ tunnel all their connections. Only works in SSH.
 
 \dt \cw{-i} \e{path}
 
-\dd Private key file for authentication.
+\dd Private key file for user authentication.
+
+\dt \cw{\-hostkey} \e{key}
+
+\dd Specify an acceptable host public key. This option may be specified
+multiple times; each key can be either a fingerprint (\cw{99:aa:bb:...}) or
+a base64-encoded blob in OpenSSH's one-line format.
+
+\lcont{ Specifying this option overrides automated host key
+management; \e{only} the key(s) specified on the command-line will be
+accepted, and the host's key will not be cached. }
 
 \dt \cw{-s}
 

diff --git a/doc/man-pscp.but b/doc/man-pscp.but
index ae43bb7c434681facff27755aa24360ebf7b0b5d..e549279b9e70a274a23242546122f80dc600d6c8 100644 (file)
--- a/doc/man-pscp.but
+++ b/doc/man-pscp.but
@@ -93,7 +93,17 @@ commands such as \q{\c{w}}).
 
 \dt \cw{-i} \e{path}
 
-\dd Private key file for authentication.
+\dd Private key file for user authentication.
+
+\dt \cw{\-hostkey} \e{key}
+
+\dd Specify an acceptable host public key. This option may be specified
+multiple times; each key can be either a fingerprint (\cw{99:aa:bb:...}) or
+a base64-encoded blob in OpenSSH's one-line format.
+
+\lcont{ Specifying this option overrides automated host key
+management; \e{only} the key(s) specified on the command-line will be
+accepted, and the host's key will not be cached. }
 
 \dt \cw{-scp}
 

diff --git a/doc/man-psft.but b/doc/man-psft.but
index 29939b92f465258bf666af633e7cead67e69fa64..a3a1362af313b397a6b2ddb3e4202692f96c6cef 100644 (file)
--- a/doc/man-psft.but
+++ b/doc/man-psft.but
@@ -81,7 +81,17 @@ commands such as \q{\c{w}}).
 
 \dt \cw{-i} \e{path}
 
-\dd Private key file for authentication.
+\dd Private key file for user authentication.
+
+\dt \cw{\-hostkey} \e{key}
+
+\dd Specify an acceptable host public key. This option may be specified
+multiple times; each key can be either a fingerprint (\cw{99:aa:bb:...}) or
+a base64-encoded blob in OpenSSH's one-line format.
+
+\lcont{ Specifying this option overrides automated host key
+management; \e{only} the key(s) specified on the command-line will be
+accepted, and the host's key will not be cached. }
 
 \S{psftp-manpage-commands} COMMANDS
 

diff --git a/doc/man-putt.but b/doc/man-putt.but
index 4c680121c61cf02c5796bb19065cba695a041019..09d60a799819ccd3ae9ece24c17e6c5a782de9f1 100644 (file)
--- a/doc/man-putt.but
+++ b/doc/man-putt.but
@@ -219,10 +219,20 @@ pseudo-terminal at the server end.
 
 \dt \cw{\-i} \e{keyfile}
 
-\dd Specify a private key file to use for authentication. For SSH-2
+\dd Specify a private key file to use for user authentication. For SSH-2
 keys, this key file must be in PuTTY's format, not OpenSSH's or
 anyone else's.
 
+\dt \cw{\-hostkey} \e{key}
+
+\dd Specify an acceptable host public key. This option may be specified
+multiple times; each key can be either a fingerprint (\cw{99:aa:bb:...}) or
+a base64-encoded blob in OpenSSH's one-line format.
+
+\lcont{ Specifying this option overrides automated host key
+management; \e{only} the key(s) specified on the command-line will be
+accepted, and the host's key will not be cached. }
+
 \dt \cw{\-sercfg} \e{configuration-string}
 
 \dd Specify the configuration parameters for the serial port, in

diff --git a/pscp.c b/pscp.c
index f63e6b5986538acfe18ecdbd80281ea800d812f9..e56d760fbd7f09dc2d45f831fbc16efaea9ba1a6 100644 (file)
--- a/pscp.c
+++ b/pscp.c
@@ -2253,9 +2253,11 @@ static void usage(void)
     printf("  -1 -2     force use of particular SSH protocol version\n");
     printf("  -4 -6     force use of IPv4 or IPv6\n");
     printf("  -C        enable compression\n");
-    printf("  -i key    private key file for authentication\n");
+    printf("  -i key    private key file for user authentication\n");
     printf("  -noagent  disable use of Pageant\n");
     printf("  -agent    enable use of Pageant\n");
+    printf("  -hostkey aa:bb:cc:...\n");
+    printf("            manually specify a host key (may be repeated)\n");
     printf("  -batch    disable all interactive prompts\n");
     printf("  -unsafe   allow server-side wildcards (DANGEROUS)\n");
     printf("  -sftp     force use of SFTP protocol\n");

diff --git a/psftp.c b/psftp.c
index c6ed98e97edca5e06853aa4ba9be18e3a92dfa79..3fbd0c43c8ba9f596ac4f7596bd97e9c4e3b28cc 100644 (file)
--- a/psftp.c
+++ b/psftp.c
@@ -2668,9 +2668,11 @@ static void usage(void)
     printf("  -1 -2     force use of particular SSH protocol version\n");
     printf("  -4 -6     force use of IPv4 or IPv6\n");
     printf("  -C        enable compression\n");
-    printf("  -i key    private key file for authentication\n");
+    printf("  -i key    private key file for user authentication\n");
     printf("  -noagent  disable use of Pageant\n");
     printf("  -agent    enable use of Pageant\n");
+    printf("  -hostkey aa:bb:cc:...\n");
+    printf("            manually specify a host key (may be repeated)\n");
     printf("  -batch    disable all interactive prompts\n");
     cleanup_exit(1);
 }

diff --git a/unix/uxplink.c b/unix/uxplink.c
index ee45dc045883782753643928c3b092b181df290b..ab674afe73ae8f5128d55d234ecf4c84362bd6cc 100644 (file)
--- a/unix/uxplink.c
+++ b/unix/uxplink.c
@@ -570,9 +570,11 @@ static void usage(void)
     printf("  -1 -2     force use of particular protocol version\n");
     printf("  -4 -6     force use of IPv4 or IPv6\n");
     printf("  -C        enable compression\n");
-    printf("  -i key    private key file for authentication\n");
+    printf("  -i key    private key file for user authentication\n");
     printf("  -noagent  disable use of Pageant\n");
     printf("  -agent    enable use of Pageant\n");
+    printf("  -hostkey aa:bb:cc:...\n");
+    printf("            manually specify a host key (may be repeated)\n");
     printf("  -m file   read remote command(s) from file\n");
     printf("  -s        remote command is an SSH subsystem (SSH-2 only)\n");
     printf("  -N        don't start a shell/command (SSH-2 only)\n");

diff --git a/windows/winplink.c b/windows/winplink.c
index 451eff3b8907d3ed98445c0ced3a8a954b6e0dbd..169d6bc8f751c5324f1b2841bb0089512adf1ba6 100644 (file)
--- a/windows/winplink.c
+++ b/windows/winplink.c
@@ -200,9 +200,11 @@ static void usage(void)
     printf("  -1 -2     force use of particular protocol version\n");
     printf("  -4 -6     force use of IPv4 or IPv6\n");
     printf("  -C        enable compression\n");
-    printf("  -i key    private key file for authentication\n");
+    printf("  -i key    private key file for user authentication\n");
     printf("  -noagent  disable use of Pageant\n");
     printf("  -agent    enable use of Pageant\n");
+    printf("  -hostkey aa:bb:cc:...\n");
+    printf("            manually specify a host key (may be repeated)\n");
     printf("  -m file   read remote command(s) from file\n");
     printf("  -s        remote command is an SSH subsystem (SSH-2 only)\n");
     printf("  -N        don't start a shell/command (SSH-2 only)\n");