diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | ssh_config.5 | 14 |
2 files changed, 11 insertions, 6 deletions
@@ -8,6 +8,9 @@ | |||
8 | - jmc@cvs.openbsd.org 2010/03/26 06:54:36 | 8 | - jmc@cvs.openbsd.org 2010/03/26 06:54:36 |
9 | [ssh.1] | 9 | [ssh.1] |
10 | tweak previous; | 10 | tweak previous; |
11 | - jmc@cvs.openbsd.org 2010/03/27 14:26:55 | ||
12 | [ssh_config.5] | ||
13 | tweak previous; ok dtucker | ||
11 | 14 | ||
12 | 20100410 | 15 | 20100410 |
13 | - (dtucker) [configure.ac] Put the check for the existence of getaddrinfo | 16 | - (dtucker) [configure.ac] Put the check for the existence of getaddrinfo |
diff --git a/ssh_config.5 b/ssh_config.5 index 410853560..2945e48b6 100644 --- a/ssh_config.5 +++ b/ssh_config.5 | |||
@@ -34,8 +34,8 @@ | |||
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.130 2010/03/26 01:06:13 dtucker Exp $ | 37 | .\" $OpenBSD: ssh_config.5,v 1.131 2010/03/27 14:26:55 jmc Exp $ |
38 | .Dd $Mdocdate: March 26 2010 $ | 38 | .Dd $Mdocdate: March 27 2010 $ |
39 | .Dt SSH_CONFIG 5 | 39 | .Dt SSH_CONFIG 5 |
40 | .Os | 40 | .Os |
41 | .Sh NAME | 41 | .Sh NAME |
@@ -732,10 +732,12 @@ authentication methods. | |||
732 | This allows a client to prefer one method (e.g.\& | 732 | This allows a client to prefer one method (e.g.\& |
733 | .Cm keyboard-interactive ) | 733 | .Cm keyboard-interactive ) |
734 | over another method (e.g.\& | 734 | over another method (e.g.\& |
735 | .Cm password ) | 735 | .Cm password ) . |
736 | The default for this option is: | 736 | The default is: |
737 | .Do gssapi-with-mic,hostbased,publickey,keyboard-interactive,password | 737 | .Bd -literal -offset indent |
738 | .Dc . | 738 | gssapi-with-mic,hostbased,publickey, |
739 | keyboard-interactive,password | ||
740 | .Ed | ||
739 | .It Cm Protocol | 741 | .It Cm Protocol |
740 | Specifies the protocol versions | 742 | Specifies the protocol versions |
741 | .Xr ssh 1 | 743 | .Xr ssh 1 |