summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-06-13 13:01:41 +1000
committerDamien Miller <djm@mindrot.org>2006-06-13 13:01:41 +1000
commit3c6ed7bbd569a33d31533587e41b8ff87d282de0 (patch)
treed0962d35d9c34b18bfc1d5f920a0476f860a618a
parent81a38928eb2728efb36e970259dde8f108c08db7 (diff)
- jmc@cvs.openbsd.org 2006/05/29 16:10:03
[ssh_config.5] oops - previous was too long; split the list of auths up
-rw-r--r--ChangeLog9
-rw-r--r--ssh_config.59
2 files changed, 13 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 0d9449ec6..d130a420f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,8 +18,11 @@
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 19 - dtucker@cvs.openbsd.org 2006/05/29 12:56:33
20 [ssh_config] 20 [ssh_config]
21 Add GSSAPIAuthentication and GSSAPIDelegateCredentials to examples in sample 21 Add GSSAPIAuthentication and GSSAPIDelegateCredentials to examples in
22 ssh_config. ok markus@ 22 sample ssh_config. ok markus@
23 - jmc@cvs.openbsd.org 2006/05/29 16:10:03
24 [ssh_config.5]
25 oops - previous was too long; split the list of auths up
23 26
2420060521 2720060521
25 - (dtucker) [auth.c monitor.c] Now that we don't log from both the monitor 28 - (dtucker) [auth.c monitor.c] Now that we don't log from both the monitor
@@ -4653,4 +4656,4 @@
4653 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4656 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4654 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4657 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4655 4658
4656$Id: ChangeLog,v 1.4336 2006/06/13 03:01:09 djm Exp $ 4659$Id: ChangeLog,v 1.4337 2006/06/13 03:01:41 djm Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index 5f66cd9d8..0d40fd63e 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.93 2006/05/29 12:54:08 dtucker Exp $ 37.\" $OpenBSD: ssh_config.5,v 1.94 2006/05/29 16:10:03 jmc 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,12 @@ 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 gssapi-with-mic,hostbased,publickey,keyboard-interactive,password . 681.Do gssapi-with-mic ,
682hostbased,
683publickey,
684keyboard-interactive,
685password
686.Dc .
682.It Cm Protocol 687.It Cm Protocol
683Specifies the protocol versions 688Specifies the protocol versions
684.Xr ssh 1 689.Xr ssh 1