summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh_config.54
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ae7b7562e..54f18b659 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@
13 - miod@cvs.openbsd.org 2006/05/18 21:27:25 13 - miod@cvs.openbsd.org 2006/05/18 21:27:25
14 [kexdhc.c kexgexc.c] 14 [kexdhc.c kexgexc.c]
15 paramter -> parameter 15 paramter -> parameter
16 - dtucker@cvs.openbsd.org 2006/05/29 12:54:08
17 [ssh_config.5]
18 Add gssapi-with-mic to PreferredAuthentications default list; ok jmc
16 19
1720060521 2020060521
18 - (dtucker) [auth.c monitor.c] Now that we don't log from both the monitor 21 - (dtucker) [auth.c monitor.c] Now that we don't log from both the monitor
@@ -4646,4 +4649,4 @@
4646 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4649 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4647 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4650 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4648 4651
4649$Id: ChangeLog,v 1.4334 2006/06/13 03:00:41 djm Exp $ 4652$Id: ChangeLog,v 1.4335 2006/06/13 03:00:55 djm Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index 7744e95f9..5f66cd9d8 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.92 2006/03/31 09:13:56 djm Exp $ 37.\" $OpenBSD: ssh_config.5,v 1.93 2006/05/29 12:54:08 dtucker 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
@@ -678,7 +678,7 @@ This allows a client to prefer one method (e.g.\&
678over another method (e.g.\& 678over another method (e.g.\&
679.Cm password ) 679.Cm password )
680The default for this option is: 680The default for this option is:
681.Dq hostbased,publickey,keyboard-interactive,password . 681.Dq gssapi-with-mic,hostbased,publickey,keyboard-interactive,password .
682.It Cm Protocol 682.It Cm Protocol
683Specifies the protocol versions 683Specifies the protocol versions
684.Xr ssh 1 684.Xr ssh 1