- jmc@cvs.openbsd.org 2010/03/27 14:26:55

[ssh_config.5]
     tweak previous; ok dtucker
This commit is contained in:
Damien Miller 2010-04-16 15:52:24 +10:00
parent 67f30d70d9
commit 544378da56
2 changed files with 11 additions and 6 deletions

View File

@ -8,6 +8,9 @@
- jmc@cvs.openbsd.org 2010/03/26 06:54:36 - jmc@cvs.openbsd.org 2010/03/26 06:54:36
[ssh.1] [ssh.1]
tweak previous; tweak previous;
- jmc@cvs.openbsd.org 2010/03/27 14:26:55
[ssh_config.5]
tweak previous; ok dtucker
20100410 20100410
- (dtucker) [configure.ac] Put the check for the existence of getaddrinfo - (dtucker) [configure.ac] Put the check for the existence of getaddrinfo

View File

@ -34,8 +34,8 @@
.\" (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.130 2010/03/26 01:06:13 dtucker Exp $ .\" $OpenBSD: ssh_config.5,v 1.131 2010/03/27 14:26:55 jmc Exp $
.Dd $Mdocdate: March 26 2010 $ .Dd $Mdocdate: March 27 2010 $
.Dt SSH_CONFIG 5 .Dt SSH_CONFIG 5
.Os .Os
.Sh NAME .Sh NAME
@ -732,10 +732,12 @@ authentication methods.
This allows a client to prefer one method (e.g.\& This allows a client to prefer one method (e.g.\&
.Cm keyboard-interactive ) .Cm keyboard-interactive )
over another method (e.g.\& over another method (e.g.\&
.Cm password ) .Cm password ) .
The default for this option is: The default is:
.Do gssapi-with-mic,hostbased,publickey,keyboard-interactive,password .Bd -literal -offset indent
.Dc . gssapi-with-mic,hostbased,publickey,
keyboard-interactive,password
.Ed
.It Cm Protocol .It Cm Protocol
Specifies the protocol versions Specifies the protocol versions
.Xr ssh 1 .Xr ssh 1