diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | scp.1 | 3 | ||||
-rw-r--r-- | sftp.1 | 3 | ||||
-rw-r--r-- | ssh.1 | 3 | ||||
-rw-r--r-- | ssh_config.5 | 6 |
5 files changed, 15 insertions, 5 deletions
@@ -35,6 +35,9 @@ | |||
35 | - djm@cvs.openbsd.org 2004/09/25 03:45:14 | 35 | - djm@cvs.openbsd.org 2004/09/25 03:45:14 |
36 | [sshd.c] | 36 | [sshd.c] |
37 | these printf args are no longer double; ok deraadt@ markus@ | 37 | these printf args are no longer double; ok deraadt@ markus@ |
38 | - djm@cvs.openbsd.org 2004/10/07 10:10:24 | ||
39 | [scp.1 sftp.1 ssh.1 ssh_config.5] | ||
40 | document KbdInteractiveDevices; ok markus@ | ||
38 | 41 | ||
39 | 20041102 | 42 | 20041102 |
40 | - (dtucker) [configure.ac includes.h] Bug #947: Fix compile error on HP-UX | 43 | - (dtucker) [configure.ac includes.h] Bug #947: Fix compile error on HP-UX |
@@ -1814,4 +1817,4 @@ | |||
1814 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 1817 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
1815 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 1818 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
1816 | 1819 | ||
1817 | $Id: ChangeLog,v 1.3571 2004/11/05 09:20:59 dtucker Exp $ | 1820 | $Id: ChangeLog,v 1.3572 2004/11/05 09:22:00 dtucker Exp $ |
@@ -9,7 +9,7 @@ | |||
9 | .\" | 9 | .\" |
10 | .\" Created: Sun May 7 00:14:37 1995 ylo | 10 | .\" Created: Sun May 7 00:14:37 1995 ylo |
11 | .\" | 11 | .\" |
12 | .\" $OpenBSD: scp.1,v 1.36 2004/06/13 15:03:02 djm Exp $ | 12 | .\" $OpenBSD: scp.1,v 1.37 2004/10/07 10:10:24 djm Exp $ |
13 | .\" | 13 | .\" |
14 | .Dd September 25, 1999 | 14 | .Dd September 25, 1999 |
15 | .Dt SCP 1 | 15 | .Dt SCP 1 |
@@ -140,6 +140,7 @@ For full details of the options listed below, and their possible values, see | |||
140 | .It HostName | 140 | .It HostName |
141 | .It IdentityFile | 141 | .It IdentityFile |
142 | .It IdentitiesOnly | 142 | .It IdentitiesOnly |
143 | .It KbdInteractiveDevices | ||
143 | .It LogLevel | 144 | .It LogLevel |
144 | .It MACs | 145 | .It MACs |
145 | .It NoHostAuthenticationForLocalhost | 146 | .It NoHostAuthenticationForLocalhost |
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: sftp.1,v 1.57 2004/06/21 22:41:31 djm Exp $ | 1 | .\" $OpenBSD: sftp.1,v 1.58 2004/10/07 10:10:24 djm Exp $ |
2 | .\" | 2 | .\" |
3 | .\" Copyright (c) 2001 Damien Miller. All rights reserved. | 3 | .\" Copyright (c) 2001 Damien Miller. All rights reserved. |
4 | .\" | 4 | .\" |
@@ -166,6 +166,7 @@ For full details of the options listed below, and their possible values, see | |||
166 | .It HostName | 166 | .It HostName |
167 | .It IdentityFile | 167 | .It IdentityFile |
168 | .It IdentitiesOnly | 168 | .It IdentitiesOnly |
169 | .It KbdInteractiveDevices | ||
169 | .It LogLevel | 170 | .It LogLevel |
170 | .It MACs | 171 | .It MACs |
171 | .It NoHostAuthenticationForLocalhost | 172 | .It NoHostAuthenticationForLocalhost |
@@ -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.1,v 1.196 2004/08/30 21:22:49 jmc Exp $ | 37 | .\" $OpenBSD: ssh.1,v 1.197 2004/10/07 10:10:24 djm Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSH 1 | 39 | .Dt SSH 1 |
40 | .Os | 40 | .Os |
@@ -675,6 +675,7 @@ For full details of the options listed below, and their possible values, see | |||
675 | .It HostName | 675 | .It HostName |
676 | .It IdentityFile | 676 | .It IdentityFile |
677 | .It IdentitiesOnly | 677 | .It IdentitiesOnly |
678 | .It KbdInteractiveDevices | ||
678 | .It LocalForward | 679 | .It LocalForward |
679 | .It LogLevel | 680 | .It LogLevel |
680 | .It MACs | 681 | .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 @@ | |||
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.38 2004/06/26 09:11:14 jmc Exp $ | 37 | .\" $OpenBSD: ssh_config.5,v 1.39 2004/10/07 10:10:24 djm 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 |
@@ -467,6 +467,10 @@ This option is intented for situations where | |||
467 | offers many different identities. | 467 | offers many different identities. |
468 | The default is | 468 | The default is |
469 | .Dq no . | 469 | .Dq no . |
470 | .It Cm KbdInteractiveDevices | ||
471 | Specifies the list of methods to use in keyboard-interactive authentication. | ||
472 | Multiple method names must be comma-separated. | ||
473 | The default is to use the server specified list. | ||
470 | .It Cm LocalForward | 474 | .It Cm LocalForward |
471 | Specifies that a TCP/IP port on the local machine be forwarded over | 475 | Specifies that a TCP/IP port on the local machine be forwarded over |
472 | the secure channel to the specified host and port from the remote machine. | 476 | the secure channel to the specified host and port from the remote machine. |