tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- jmc@cvs.openbsd.org 2006/05/29 16:10:03 

[ssh_config.5]
     oops - previous was too long; split the list of auths up
This commit is contained in:
Damien Miller 2006-06-13 13:01:41 +10:00
parent 81a38928eb
commit 3c6ed7bbd5
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -18,8 +18,11 @@
Add gssapi-with-mic to PreferredAuthentications default list; ok jmc Add gssapi-with-mic to PreferredAuthentications default list; ok jmc
- dtucker@cvs.openbsd.org 2006/05/29 12:56:33 - dtucker@cvs.openbsd.org 2006/05/29 12:56:33
[ssh_config] [ssh_config]
Add GSSAPIAuthentication and GSSAPIDelegateCredentials to examples in sample Add GSSAPIAuthentication and GSSAPIDelegateCredentials to examples in
ssh_config. ok markus@ 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 20060521
- (dtucker) [auth.c monitor.c] Now that we don't log from both the monitor - (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) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (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 $

9
ssh_config.5
View File

@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" 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 .Dd September 25, 1999
.Dt SSH_CONFIG 5 .Dt SSH_CONFIG 5
.Os .Os
@ -678,7 +678,12 @@ This allows a client to prefer one method (e.g.\&
over another method (e.g.\& over another method (e.g.\&
.Cm password ) .Cm password )
The default for this option is: 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 .It Cm Protocol
Specifies the protocol versions Specifies the protocol versions
.Xr ssh 1 .Xr ssh 1