summaryrefslogtreecommitdiff
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
parent45350e83746e958d3ee2a375fb3c9d8f79f61650 (diff)
- markus@cvs.openbsd.org 2001/07/23 12:47:05
[ssh.1] sync PreferredAuthentications
-rw-r--r--ChangeLog5
-rw-r--r--ssh.114
2 files changed, 10 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 6935e528b..1de412e3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,9 @@
17 [sshconnect2.c] 17 [sshconnect2.c]
18 reorder default sequence of userauth methods to match ssh behaviour: 18 reorder default sequence of userauth methods to match ssh behaviour:
19 hostbased,publickey,keyboard-interactive,password 19 hostbased,publickey,keyboard-interactive,password
20 - markus@cvs.openbsd.org 2001/07/23 12:47:05
21 [ssh.1]
22 sync PreferredAuthentications
20 23
2120010803 2420010803
22 - (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on 25 - (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on
@@ -6127,4 +6130,4 @@
6127 - Wrote replacements for strlcpy and mkdtemp 6130 - Wrote replacements for strlcpy and mkdtemp
6128 - Released 1.0pre1 6131 - Released 1.0pre1
6129 6132
6130$Id: ChangeLog,v 1.1430 2001/08/06 20:57:11 mouring Exp $ 6133$Id: ChangeLog,v 1.1431 2001/08/06 20:58:51 mouring Exp $
diff --git a/ssh.1 b/ssh.1
index f8d9fc689..b96edeacc 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,7 @@
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.1,v 1.122 2001/07/22 22:04:19 markus Exp $ 37.\" $OpenBSD: ssh.1,v 1.123 2001/07/23 12:47:05 markus Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
@@ -209,12 +209,10 @@ When a user connects using the protocol version 2
209different authentication methods are available. 209different authentication methods are available.
210Using the default values for 210Using the default values for
211.Cm PreferredAuthentications , 211.Cm PreferredAuthentications ,
212the client will try to authenticate first using the public key method; 212the client will try to authenticate first using the hostbased method;
213if this method fails password authentication is attempted, 213if this method fails public key authentication is attempted,
214and finally if this method fails keyboard-interactive authentication 214and finally if this method fails keyboard-interactive and
215is attempted. 215password authentication are tried.
216If this method fails password authentication is
217tried.
218.Pp 216.Pp
219The public key method is similar to RSA authentication described 217The public key method is similar to RSA authentication described
220in the previous section and allows the RSA or DSA algorithm to be used: 218in 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.
912over another method (e.g. 910over another method (e.g.
913.Cm password ) 911.Cm password )
914The default for this option is: 912The default for this option is:
915.Dq publickey,hostbased,password,keyboard-interactive 913.Dq hostbased,publickey,keyboard-interactive,password
916.It Cm Protocol 914.It Cm Protocol
917Specifies the protocol versions 915Specifies the protocol versions
918.Nm 916.Nm