summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--scp.13
-rw-r--r--sftp.13
-rw-r--r--ssh.13
-rw-r--r--ssh_config.56
5 files changed, 15 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 8361e329e..8ba77540d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,9 @@
- djm@cvs.openbsd.org 2004/09/25 03:45:14
[sshd.c]
these printf args are no longer double; ok deraadt@ markus@
+ - djm@cvs.openbsd.org 2004/10/07 10:10:24
+ [scp.1 sftp.1 ssh.1 ssh_config.5]
+ document KbdInteractiveDevices; ok markus@
20041102
- (dtucker) [configure.ac includes.h] Bug #947: Fix compile error on HP-UX
@@ -1814,4 +1817,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.3571 2004/11/05 09:20:59 dtucker Exp $
+$Id: ChangeLog,v 1.3572 2004/11/05 09:22:00 dtucker Exp $
diff --git a/scp.1 b/scp.1
index f346b2ae9..30049c2b6 100644
--- a/scp.1
+++ b/scp.1
@@ -9,7 +9,7 @@
.\"
.\" Created: Sun May 7 00:14:37 1995 ylo
.\"
-.\" $OpenBSD: scp.1,v 1.36 2004/06/13 15:03:02 djm Exp $
+.\" $OpenBSD: scp.1,v 1.37 2004/10/07 10:10:24 djm Exp $
.\"
.Dd September 25, 1999
.Dt SCP 1
@@ -140,6 +140,7 @@ For full details of the options listed below, and their possible values, see
.It HostName
.It IdentityFile
.It IdentitiesOnly
+.It KbdInteractiveDevices
.It LogLevel
.It MACs
.It NoHostAuthenticationForLocalhost
diff --git a/sftp.1 b/sftp.1
index 3b035b1d4..fe3e4de32 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.57 2004/06/21 22:41:31 djm Exp $
+.\" $OpenBSD: sftp.1,v 1.58 2004/10/07 10:10:24 djm Exp $
.\"
.\" Copyright (c) 2001 Damien Miller. All rights reserved.
.\"
@@ -166,6 +166,7 @@ For full details of the options listed below, and their possible values, see
.It HostName
.It IdentityFile
.It IdentitiesOnly
+.It KbdInteractiveDevices
.It LogLevel
.It MACs
.It NoHostAuthenticationForLocalhost
diff --git a/ssh.1 b/ssh.1
index 88dde4b1e..06cb60cec 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $OpenBSD: ssh.1,v 1.196 2004/08/30 21:22:49 jmc Exp $
+.\" $OpenBSD: ssh.1,v 1.197 2004/10/07 10:10:24 djm Exp $
.Dd September 25, 1999
.Dt SSH 1
.Os
@@ -675,6 +675,7 @@ For full details of the options listed below, and their possible values, see
.It HostName
.It IdentityFile
.It IdentitiesOnly
+.It KbdInteractiveDevices
.It LocalForward
.It LogLevel
.It MACs
diff --git a/ssh_config.5 b/ssh_config.5
index 0e1a031e5..bd0e3e4bd 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $OpenBSD: ssh_config.5,v 1.38 2004/06/26 09:11:14 jmc Exp $
+.\" $OpenBSD: ssh_config.5,v 1.39 2004/10/07 10:10:24 djm Exp $
.Dd September 25, 1999
.Dt SSH_CONFIG 5
.Os
@@ -467,6 +467,10 @@ This option is intented for situations where
offers many different identities.
The default is
.Dq no .
+.It Cm KbdInteractiveDevices
+Specifies the list of methods to use in keyboard-interactive authentication.
+Multiple method names must be comma-separated.
+The default is to use the server specified list.
.It Cm LocalForward
Specifies that a TCP/IP port on the local machine be forwarded over
the secure channel to the specified host and port from the remote machine.