diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | sshd_config.5 | 11 |
2 files changed, 13 insertions, 3 deletions
@@ -13,6 +13,9 @@ | |||
13 | - itojun@cvs.openbsd.org 2002/07/09 12:04:02 | 13 | - itojun@cvs.openbsd.org 2002/07/09 12:04:02 |
14 | [sshconnect.c] | 14 | [sshconnect.c] |
15 | ed static function (less warnings) | 15 | ed static function (less warnings) |
16 | - stevesk@cvs.openbsd.org 2002/07/09 17:46:25 | ||
17 | [sshd_config.5] | ||
18 | clarify no preference ordering in protocol list; ok markus@ | ||
16 | 19 | ||
17 | 20020709 | 20 | 20020709 |
18 | - (bal) NO_IPPORT_RESERVED_CONCEPT used instead of CYGWIN so other platforms | 21 | - (bal) NO_IPPORT_RESERVED_CONCEPT used instead of CYGWIN so other platforms |
@@ -1336,4 +1339,4 @@ | |||
1336 | - (stevesk) entropy.c: typo in debug message | 1339 | - (stevesk) entropy.c: typo in debug message |
1337 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ | 1340 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ |
1338 | 1341 | ||
1339 | $Id: ChangeLog,v 1.2356 2002/07/11 03:58:11 mouring Exp $ | 1342 | $Id: ChangeLog,v 1.2357 2002/07/11 03:59:18 mouring Exp $ |
diff --git a/sshd_config.5 b/sshd_config.5 index aa7b7c7d4..6625865ef 100644 --- a/sshd_config.5 +++ b/sshd_config.5 | |||
@@ -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: sshd_config.5,v 1.4 2002/06/22 16:45:29 stevesk Exp $ | 37 | .\" $OpenBSD: sshd_config.5,v 1.5 2002/07/09 17:46:25 stevesk Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSHD_CONFIG 5 | 39 | .Dt SSHD_CONFIG 5 |
40 | .Os | 40 | .Os |
@@ -499,7 +499,7 @@ The default is | |||
499 | .It Cm Protocol | 499 | .It Cm Protocol |
500 | Specifies the protocol versions | 500 | Specifies the protocol versions |
501 | .Nm sshd | 501 | .Nm sshd |
502 | should support. | 502 | supports. |
503 | The possible values are | 503 | The possible values are |
504 | .Dq 1 | 504 | .Dq 1 |
505 | and | 505 | and |
@@ -507,6 +507,13 @@ and | |||
507 | Multiple versions must be comma-separated. | 507 | Multiple versions must be comma-separated. |
508 | The default is | 508 | The default is |
509 | .Dq 2,1 . | 509 | .Dq 2,1 . |
510 | Note that the order of the protocol list does not indicate preference, | ||
511 | because the client selects among multiple protocol versions offered | ||
512 | by the server. | ||
513 | Specifying | ||
514 | .Dq 2,1 | ||
515 | is identical to | ||
516 | .Dq 1,2 . | ||
510 | .It Cm PubkeyAuthentication | 517 | .It Cm PubkeyAuthentication |
511 | Specifies whether public key authentication is allowed. | 518 | Specifies whether public key authentication is allowed. |
512 | The default is | 519 | The default is |