aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacques Vidrine <nectar@FreeBSD.org>2002-03-08 13:53:04 +0000
committerJacques Vidrine <nectar@FreeBSD.org>2002-03-08 13:53:04 +0000
commit164e0ce6ed97d03f5f931a63f5e3757331eb5822 (patch)
tree0873d047391acf8fda870288bdce92e81bbc1574
parent7c235ec6b04751124e8224cddfeee1e4ea4641f0 (diff)
downloadsrc-164e0ce6ed97d03f5f931a63f5e3757331eb5822.tar.gz
src-164e0ce6ed97d03f5f931a63f5e3757331eb5822.zip
Apply fix for OpenSSH off-by-one error (FreeBSD-02:13.openssh).
Notes
Notes: svn path=/releng/4.3/; revision=91892
-rw-r--r--UPDATING3
-rw-r--r--crypto/openssh/channels.c2
-rw-r--r--crypto/openssh/version.h2
-rw-r--r--sys/conf/newvers.sh2
4 files changed, 6 insertions, 3 deletions
diff --git a/UPDATING b/UPDATING
index ba8acffe723e..5b84f14cfac8 100644
--- a/UPDATING
+++ b/UPDATING
@@ -16,6 +16,9 @@ minimal number of processes, if possible, for that patch. For those
updates that don't have an advisory, or to be safe, you can do a full
build and install as described in the COMMON ITEMS section.
+20020307: p28 FreeBSD-SA-02:13.openssh
+ OpenSSH off-by-one error.
+
20020223: p27
zlib inflate error handling.
diff --git a/crypto/openssh/channels.c b/crypto/openssh/channels.c
index 1abc9409e6dc..176398c40f1e 100644
--- a/crypto/openssh/channels.c
+++ b/crypto/openssh/channels.c
@@ -157,7 +157,7 @@ Channel *
channel_lookup(int id)
{
Channel *c;
- if (id < 0 || id > channels_alloc) {
+ if (id < 0 || id >= channels_alloc) {
log("channel_lookup: %d: bad id", id);
return NULL;
}
diff --git a/crypto/openssh/version.h b/crypto/openssh/version.h
index 85f4fe22bfbd..899adbb85346 100644
--- a/crypto/openssh/version.h
+++ b/crypto/openssh/version.h
@@ -1,4 +1,4 @@
/* $FreeBSD$ */
/* $OpenBSD: version.h,v 1.13 2000/10/16 09:38:45 djm Exp $ */
-#define SSH_VERSION "OpenSSH_2.3.0 green@FreeBSD.org 20011202"
+#define SSH_VERSION "OpenSSH_2.3.0 green@FreeBSD.org 20020307"
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 504f64da4c39..cdf882da4d0b 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -36,7 +36,7 @@
TYPE="FreeBSD"
REVISION="4.3"
-BRANCH="RELEASE-p27"
+BRANCH="RELEASE-p28"
RELEASE="${REVISION}-${BRANCH}"
VERSION="${TYPE} ${RELEASE}"