aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--UPDATING4
-rw-r--r--crypto/openssh/channels.c3
-rw-r--r--sys/conf/newvers.sh2
3 files changed, 5 insertions, 4 deletions
diff --git a/UPDATING b/UPDATING
index 429614746800..eff3d7f80330 100644
--- a/UPDATING
+++ b/UPDATING
@@ -8,6 +8,10 @@ Items affecting the ports and packages system can be found in
/usr/ports/UPDATING. Please read that file before running
portupgrade.
+20080416: p20 FreeBSD-SA-08:05.openssh
+ Fix logic error in sshd(8) concerning the handling of failed
+ attempts to bind ports for X11 forwarding.
+
20080214: p19 FreeBSD-SA-08:02.sendfile, FreeBSD-SA-08:03.ipsec
Fix sendfile(2) write-only file permission bypass. [08:02]
diff --git a/crypto/openssh/channels.c b/crypto/openssh/channels.c
index e663c21596c2..2888449aa537 100644
--- a/crypto/openssh/channels.c
+++ b/crypto/openssh/channels.c
@@ -2529,9 +2529,6 @@ x11_create_display_inet(int x11_display_offset, int x11_use_localhost,
debug2("bind port %d: %.100s", port, strerror(errno));
close(sock);
- if (ai->ai_next)
- continue;
-
for (n = 0; n < num_socks; n++) {
close(socks[n]);
}
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 5ccb23da8dfc..e52bdc88c62f 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
TYPE="FreeBSD"
REVISION="5.5"
-BRANCH="RELEASE-p19"
+BRANCH="RELEASE-p20"
RELEASE="${REVISION}-${BRANCH}"
VERSION="${TYPE} ${RELEASE}"