Fix logic error in sshd(8) concerning the handling of failed

attempts to bind ports for X11 forwarding.

Security:	FreeBSD-SA-08:05.openssh
Approved by:	so (cperciva)

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:	p24	FreeBSD-SA-08:05.openssh
+	Fix logic error in sshd(8) concerning the handling of failed
+	attempts to bind ports for X11 forwarding.
+
 20080214:	p23	FreeBSD-SA-08:02.sendfile
 	Fix sendfile(2) write-only file permission bypass.
 

crypto/openssh/channels.c

@@ -2708,9 +2708,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]);
 				}

sys/conf/newvers.sh

@@ -32,7 +32,7 @@
 
 TYPE="FreeBSD"
 REVISION="6.1"
-BRANCH="RELEASE-p23"
+BRANCH="RELEASE-p24"
 if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi