diff options
| author | Colin Percival <cperciva@FreeBSD.org> | 2008-04-17 00:00:54 +0000 |
|---|---|---|
| committer | Colin Percival <cperciva@FreeBSD.org> | 2008-04-17 00:00:54 +0000 |
| commit | b45fc3da3c1395db9d865c553edc78fa92ea27f4 (patch) | |
| tree | 7e454d016d88d0fa6264e4439c33c0b6b990a18d | |
| parent | 52c7bd5fc701d93f18ac34cc5e308568bd596bdb (diff) | |
Notes
| -rw-r--r-- | UPDATING | 4 | ||||
| -rw-r--r-- | crypto/openssh/channels.c | 3 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/UPDATING b/UPDATING index 75ca5241286af..cb851bb4443fc 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: p12 FreeBSD-SA-08:05.openssh + Fix logic error in sshd(8) concerning the handling of failed + attempts to bind ports for X11 forwarding. + 20080214: p11 FreeBSD-SA-08:02.sendfile Fix sendfile(2) write-only file permission bypass. diff --git a/crypto/openssh/channels.c b/crypto/openssh/channels.c index 26b63a1aae904..42ca27cb959ae 100644 --- a/crypto/openssh/channels.c +++ b/crypto/openssh/channels.c @@ -2895,9 +2895,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 da007c5fe0188..4a5a098242b27 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="6.2" -BRANCH="RELEASE-p11" +BRANCH="RELEASE-p12" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi |