diff options
| author | Damien Miller <djm@mindrot.org> | 2006-06-13 13:01:41 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2006-06-13 13:01:41 +1000 |
| commit | 3c6ed7bbd569a33d31533587e41b8ff87d282de0 (patch) | |
| tree | d0962d35d9c34b18bfc1d5f920a0476f860a618a | |
| parent | 81a38928eb2728efb36e970259dde8f108c08db7 (diff) | |
| download | openssh-git-3c6ed7bbd569a33d31533587e41b8ff87d282de0.tar.gz | |
- 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-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ssh_config.5 | 9 |
2 files changed, 13 insertions, 5 deletions
@@ -18,8 +18,11 @@ 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@ + Add GSSAPIAuthentication and GSSAPIDelegateCredentials to examples in + sample ssh_config. ok markus@ + - jmc@cvs.openbsd.org 2006/05/29 16:10:03 + [ssh_config.5] + oops - previous was too long; split the list of auths up 20060521 - (dtucker) [auth.c monitor.c] Now that we don't log from both the monitor @@ -4653,4 +4656,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.4336 2006/06/13 03:01:09 djm Exp $ +$Id: ChangeLog,v 1.4337 2006/06/13 03:01:41 djm Exp $ diff --git a/ssh_config.5 b/ssh_config.5 index 5f66cd9d..0d40fd63 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.93 2006/05/29 12:54:08 dtucker Exp $ +.\" $OpenBSD: ssh_config.5,v 1.94 2006/05/29 16:10:03 jmc Exp $ .Dd September 25, 1999 .Dt SSH_CONFIG 5 .Os @@ -678,7 +678,12 @@ This allows a client to prefer one method (e.g.\& over another method (e.g.\& .Cm password ) The default for this option is: -.Dq gssapi-with-mic,hostbased,publickey,keyboard-interactive,password . +.Do gssapi-with-mic , +hostbased, +publickey, +keyboard-interactive, +password +.Dc . .It Cm Protocol Specifies the protocol versions .Xr ssh 1 |