summaryrefslogtreecommitdiff
path: root/ssh.1
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-08-06 20:58:51 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-08-06 20:58:51 +0000
commita9086a1c4c603d277f1259b51d1df7b89a0554a8 (patch)
treeb3fcc8246a203691393cfb2587bd2df8f44f34c9 /ssh.1
parent45350e83746e958d3ee2a375fb3c9d8f79f61650 (diff)
downloadopenssh-git-a9086a1c4c603d277f1259b51d1df7b89a0554a8.tar.gz
- markus@cvs.openbsd.org 2001/07/23 12:47:05
[ssh.1] sync PreferredAuthentications
Diffstat (limited to 'ssh.1')
-rw-r--r--ssh.114
1 files changed, 6 insertions, 8 deletions
diff --git a/ssh.1 b/ssh.1
index f8d9fc68..b96edeac 100644
--- a/ssh.1
+++ b/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