diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ssh_config | 4 |
2 files changed, 8 insertions, 2 deletions
@@ -16,6 +16,10 @@ | |||
16 | - dtucker@cvs.openbsd.org 2006/05/29 12:54:08 | 16 | - dtucker@cvs.openbsd.org 2006/05/29 12:54:08 |
17 | [ssh_config.5] | 17 | [ssh_config.5] |
18 | Add gssapi-with-mic to PreferredAuthentications default list; ok jmc | 18 | Add gssapi-with-mic to PreferredAuthentications default list; ok jmc |
19 | - dtucker@cvs.openbsd.org 2006/05/29 12:56:33 | ||
20 | [ssh_config] | ||
21 | Add GSSAPIAuthentication and GSSAPIDelegateCredentials to examples in sample | ||
22 | ssh_config. ok markus@ | ||
19 | 23 | ||
20 | 20060521 | 24 | 20060521 |
21 | - (dtucker) [auth.c monitor.c] Now that we don't log from both the monitor | 25 | - (dtucker) [auth.c monitor.c] Now that we don't log from both the monitor |
@@ -4649,4 +4653,4 @@ | |||
4649 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 4653 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
4650 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 4654 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
4651 | 4655 | ||
4652 | $Id: ChangeLog,v 1.4335 2006/06/13 03:00:55 djm Exp $ | 4656 | $Id: ChangeLog,v 1.4336 2006/06/13 03:01:09 djm Exp $ |
diff --git a/ssh_config b/ssh_config index 7bc8762d6..177521caa 100644 --- a/ssh_config +++ b/ssh_config | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: ssh_config,v 1.21 2005/12/06 22:38:27 reyk Exp $ | 1 | # $OpenBSD: ssh_config,v 1.22 2006/05/29 12:56:33 dtucker Exp $ |
2 | 2 | ||
3 | # This is the ssh client system-wide configuration file. See | 3 | # This is the ssh client system-wide configuration file. See |
4 | # ssh_config(5) for more information. This file provides defaults for | 4 | # ssh_config(5) for more information. This file provides defaults for |
@@ -24,6 +24,8 @@ | |||
24 | # RSAAuthentication yes | 24 | # RSAAuthentication yes |
25 | # PasswordAuthentication yes | 25 | # PasswordAuthentication yes |
26 | # HostbasedAuthentication no | 26 | # HostbasedAuthentication no |
27 | # GSSAPIAuthentication no | ||
28 | # GSSAPIDelegateCredentials no | ||
27 | # BatchMode no | 29 | # BatchMode no |
28 | # CheckHostIP yes | 30 | # CheckHostIP yes |
29 | # AddressFamily any | 31 | # AddressFamily any |