summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-03-15 11:57:55 +1100
committerDamien Miller <djm@mindrot.org>2006-03-15 11:57:55 +1100
commit9cfbaecb64cbfbd7e9218faa1e95985a72d73038 (patch)
treef27c2655b56bc122ec29cfa341ad6988810be335
parentf4f22b54c0e2a454d3ac093d99f845db4da98a81 (diff)
- jmc@cvs.openbsd.org 2006/02/25 12:26:17
[ssh_config.5] document the possible values for KbdInteractiveDevices;
-rw-r--r--ChangeLog5
-rw-r--r--ssh_config.59
2 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4d21aae76..d063f9f2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -178,6 +178,9 @@
178 - jmc@cvs.openbsd.org 2006/02/24 23:51:17 178 - jmc@cvs.openbsd.org 2006/02/24 23:51:17
179 [sshd_config.5] 179 [sshd_config.5]
180 oops - bits i missed; 180 oops - bits i missed;
181 - jmc@cvs.openbsd.org 2006/02/25 12:26:17
182 [ssh_config.5]
183 document the possible values for KbdInteractiveDevices;
181 184
18220060313 18520060313
183 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) 186 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -4079,4 +4082,4 @@
4079 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4082 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4080 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4083 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4081 4084
4082$Id: ChangeLog,v 1.4190 2006/03/15 00:57:25 djm Exp $ 4085$Id: ChangeLog,v 1.4191 2006/03/15 00:57:55 djm Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index 40fef73cf..0e6a41808 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: ssh_config.5,v 1.84 2006/02/24 23:20:07 jmc Exp $ 37.\" $OpenBSD: ssh_config.5,v 1.85 2006/02/25 12:26:17 jmc Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH_CONFIG 5 39.Dt SSH_CONFIG 5
40.Os 40.Os
@@ -589,6 +589,13 @@ identities will be tried in sequence.
589Specifies the list of methods to use in keyboard-interactive authentication. 589Specifies the list of methods to use in keyboard-interactive authentication.
590Multiple method names must be comma-separated. 590Multiple method names must be comma-separated.
591The default is to use the server specified list. 591The default is to use the server specified list.
592The methods available vary depending on what the server supports.
593For an OpenSSH server,
594it may be zero or more of:
595.Dq bsdauth ,
596.Dq pam ,
597and
598.Dq skey .
592.It Cm LocalCommand 599.It Cm LocalCommand
593Specifies a command to execute on the local machine after successfully 600Specifies a command to execute on the local machine after successfully
594connecting to the server. 601connecting to the server.