diff options
author | Markus Friedl <markus@cvs.openbsd.org> | 2001-07-23 12:47:06 +0000 |
---|---|---|
committer | Markus Friedl <markus@cvs.openbsd.org> | 2001-07-23 12:47:06 +0000 |
commit | 4382110cca173babfb91b254a7205273398cf0fc (patch) | |
tree | 12985bf915aa7b571cfec4536d99b8ea62b22fff /usr.bin/ssh/ssh.1 | |
parent | 3e605c46d6cd506ae661a7549eb98c5107598cca (diff) |
sync PreferredAuthentications
Diffstat (limited to 'usr.bin/ssh/ssh.1')
-rw-r--r-- | usr.bin/ssh/ssh.1 | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/usr.bin/ssh/ssh.1 b/usr.bin/ssh/ssh.1 index f8d9fc6890b..b96edeacc83 100644 --- a/usr.bin/ssh/ssh.1 +++ b/usr.bin/ssh/ssh.1 @@ -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.1,v 1.122 2001/07/22 22:04:19 markus Exp $ +.\" $OpenBSD: ssh.1,v 1.123 2001/07/23 12:47:05 markus Exp $ .Dd September 25, 1999 .Dt SSH 1 .Os @@ -209,12 +209,10 @@ When a user connects using the protocol version 2 different authentication methods are available. Using the default values for .Cm PreferredAuthentications , -the client will try to authenticate first using the public key method; -if this method fails password authentication is attempted, -and finally if this method fails keyboard-interactive authentication -is attempted. -If this method fails password authentication is -tried. +the client will try to authenticate first using the hostbased method; +if this method fails public key authentication is attempted, +and finally if this method fails keyboard-interactive and +password authentication are tried. .Pp The public key method is similar to RSA authentication described in the previous section and allows the RSA or DSA algorithm to be used: @@ -912,7 +910,7 @@ authentication methods. This allows a client to prefer one method (e.g. over another method (e.g. .Cm password ) The default for this option is: -.Dq publickey,hostbased,password,keyboard-interactive +.Dq hostbased,publickey,keyboard-interactive,password .It Cm Protocol Specifies the protocol versions .Nm |