summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ssh_config4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 54f18b65..0d9449ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,10 @@
- dtucker@cvs.openbsd.org 2006/05/29 12:54:08
[ssh_config.5]
Add gssapi-with-mic to PreferredAuthentications default list; ok jmc
+ - dtucker@cvs.openbsd.org 2006/05/29 12:56:33
+ [ssh_config]
+ Add GSSAPIAuthentication and GSSAPIDelegateCredentials to examples in sample
+ ssh_config. ok markus@
20060521
- (dtucker) [auth.c monitor.c] Now that we don't log from both the monitor
@@ -4649,4 +4653,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.4335 2006/06/13 03:00:55 djm Exp $
+$Id: ChangeLog,v 1.4336 2006/06/13 03:01:09 djm Exp $
diff --git a/ssh_config b/ssh_config
index 7bc8762d..177521ca 100644
--- a/ssh_config
+++ b/ssh_config
@@ -1,4 +1,4 @@
-# $OpenBSD: ssh_config,v 1.21 2005/12/06 22:38:27 reyk Exp $
+# $OpenBSD: ssh_config,v 1.22 2006/05/29 12:56:33 dtucker Exp $
# This is the ssh client system-wide configuration file. See
# ssh_config(5) for more information. This file provides defaults for
@@ -24,6 +24,8 @@
# RSAAuthentication yes
# PasswordAuthentication yes
# HostbasedAuthentication no
+# GSSAPIAuthentication no
+# GSSAPIDelegateCredentials no
# BatchMode no
# CheckHostIP yes
# AddressFamily any