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 | d4c364b3dcf6dfe4e20c70d31912aad7e6219c14 (patch) | |
| tree | c01103a2a74962238d39d7018e63592455863ea7 | |
| parent | 709dbc33b14011a5969835f1d020adc93138f0b5 (diff) | |
| download | src-d4c364b3dcf6dfe4e20c70d31912aad7e6219c14.tar.gz src-d4c364b3dcf6dfe4e20c70d31912aad7e6219c14.zip | |
Fix logic error in sshd(8) concerning the handling of failedreleng/5.5
attempts to bind ports for X11 forwarding.
Security: FreeBSD-SA-08:05.openssh
Approved by: so (cperciva)
Notes
Notes:
svn path=/releng/5.5/; revision=178263
| -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
@@ -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}" |