From 658f9455386fb81d03429a00976986ac18ba4d5e Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Tue, 13 Jun 2006 13:00:55 +1000 Subject: [PATCH] - dtucker@cvs.openbsd.org 2006/05/29 12:54:08 [ssh_config.5] Add gssapi-with-mic to PreferredAuthentications default list; ok jmc --- ChangeLog | 5 ++++- ssh_config.5 | 4 ++-- 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 @@ - miod@cvs.openbsd.org 2006/05/18 21:27:25 [kexdhc.c kexgexc.c] paramter -> parameter + - dtucker@cvs.openbsd.org 2006/05/29 12:54:08 + [ssh_config.5] + Add gssapi-with-mic to PreferredAuthentications default list; ok jmc 20060521 - (dtucker) [auth.c monitor.c] Now that we don't log from both the monitor @@ -4646,4 +4649,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.4334 2006/06/13 03:00:41 djm Exp $ +$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 @@ .\" (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.92 2006/03/31 09:13:56 djm Exp $ +.\" $OpenBSD: ssh_config.5,v 1.93 2006/05/29 12:54:08 dtucker Exp $ .Dd September 25, 1999 .Dt SSH_CONFIG 5 .Os @@ -678,7 +678,7 @@ This allows a client to prefer one method (e.g.\& over another method (e.g.\& .Cm password ) The default for this option is: -.Dq hostbased,publickey,keyboard-interactive,password . +.Dq gssapi-with-mic,hostbased,publickey,keyboard-interactive,password . .It Cm Protocol Specifies the protocol versions .Xr ssh 1