=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh.1,v retrieving revision 1.122 retrieving revision 1.123 diff -u -r1.122 -r1.123 --- src/usr.bin/ssh/ssh.1 2001/07/22 22:04:19 1.122 +++ src/usr.bin/ssh/ssh.1 2001/07/23 12:47:05 1.123 @@ -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 @@ 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 @@ 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