[ssh_config.5]
     Add gssapi-with-mic to PreferredAuthentications default list; ok jmc
This commit is contained in:
Damien Miller 2006-06-13 13:00:55 +10:00
parent ad6b14d274
commit 658f945538
2 changed files with 6 additions and 3 deletions

View File

@ -13,6 +13,9 @@
- miod@cvs.openbsd.org 2006/05/18 21:27:25 - miod@cvs.openbsd.org 2006/05/18 21:27:25
[kexdhc.c kexgexc.c] [kexdhc.c kexgexc.c]
paramter -> parameter paramter -> parameter
- dtucker@cvs.openbsd.org 2006/05/29 12:54:08
[ssh_config.5]
Add gssapi-with-mic to PreferredAuthentications default list; ok jmc
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
@ -4646,4 +4649,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.4334 2006/06/13 03:00:41 djm Exp $ $Id: ChangeLog,v 1.4335 2006/06/13 03:00:55 djm Exp $

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.92 2006/03/31 09:13:56 djm Exp $ .\" $OpenBSD: ssh_config.5,v 1.93 2006/05/29 12:54:08 dtucker Exp $
.Dd September 25, 1999 .Dd September 25, 1999
.Dt SSH_CONFIG 5 .Dt SSH_CONFIG 5
.Os .Os
@ -678,7 +678,7 @@ 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 hostbased,publickey,keyboard-interactive,password . .Dq gssapi-with-mic,hostbased,publickey,keyboard-interactive,password .
.It Cm Protocol .It Cm Protocol
Specifies the protocol versions Specifies the protocol versions
.Xr ssh 1 .Xr ssh 1