- stevesk@cvs.openbsd.org 2002/07/09 17:46:25
[sshd_config.5]
clarify no preference ordering in protocol list; ok markus@
diff --git a/ChangeLog b/ChangeLog
index 1258042..a2dc37c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@
- itojun@cvs.openbsd.org 2002/07/09 12:04:02
[sshconnect.c]
ed static function (less warnings)
+ - stevesk@cvs.openbsd.org 2002/07/09 17:46:25
+ [sshd_config.5]
+ clarify no preference ordering in protocol list; ok markus@
20020709
- (bal) NO_IPPORT_RESERVED_CONCEPT used instead of CYGWIN so other platforms
@@ -1336,4 +1339,4 @@
- (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@
-$Id: ChangeLog,v 1.2356 2002/07/11 03:58:11 mouring Exp $
+$Id: ChangeLog,v 1.2357 2002/07/11 03:59:18 mouring Exp $
diff --git a/sshd_config.5 b/sshd_config.5
index aa7b7c7..6625865 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -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: sshd_config.5,v 1.4 2002/06/22 16:45:29 stevesk Exp $
+.\" $OpenBSD: sshd_config.5,v 1.5 2002/07/09 17:46:25 stevesk Exp $
.Dd September 25, 1999
.Dt SSHD_CONFIG 5
.Os
@@ -499,7 +499,7 @@
.It Cm Protocol
Specifies the protocol versions
.Nm sshd
-should support.
+supports.
The possible values are
.Dq 1
and
@@ -507,6 +507,13 @@
Multiple versions must be comma-separated.
The default is
.Dq 2,1 .
+Note that the order of the protocol list does not indicate preference,
+because the client selects among multiple protocol versions offered
+by the server.
+Specifying
+.Dq 2,1
+is identical to
+.Dq 1,2 .
.It Cm PubkeyAuthentication
Specifies whether public key authentication is allowed.
The default is