From: basney <basney>
Date: Thu, 3 Apr 2008 17:34:15 +0000 (+0000)
Subject: merged OpenSSH 5.0p1 to trunk
X-Git-Tag: OPENSSH_5_0P1_GSSAPI_20080403~4
X-Git-Url: http://andersk.mit.edu/gitweb/gssapi-openssh.git/commitdiff_plain/247e7a27e3f1872d2a6698b113fad166fee6da36

merged OpenSSH 5.0p1 to trunk
---

diff --git a/openssh/channels.c b/openssh/channels.c
index 87dcb73..6bd6b14 100644
--- a/openssh/channels.c
+++ b/openssh/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.272 2008/01/19 23:02:40 djm Exp $ */
+/* $OpenBSD: channels.c,v 1.273 2008/04/02 21:36:51 markus Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2951,9 +2951,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/openssh/sshd.8 b/openssh/sshd.8
index 3bdc05a..c9476ad 100644
--- a/openssh/sshd.8
+++ b/openssh/sshd.8
@@ -34,8 +34,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: sshd.8,v 1.240 2008/03/26 21:28:14 djm Exp $
-.Dd $Mdocdate: March 27 2008 $
+.\" $OpenBSD: sshd.8,v 1.241 2008/03/27 22:37:57 jmc Exp $
+.Dd $Mdocdate: April 3 2008 $
 .Dt SSHD 8
 .Os
 .Sh NAME
@@ -532,7 +532,7 @@ option.
 .It Cm no-pty
 Prevents tty allocation (a request to allocate a pty will fail).
 .It Cm no-user-rc
-Disables execution of 
+Disables execution of
 .Pa ~/.ssh/rc .
 .It Cm no-X11-forwarding
 Forbids X11 forwarding when this key is used for authentication.
diff --git a/openssh/version.h b/openssh/version.h
index a8021b9..68ef0ed 100644
--- a/openssh/version.h
+++ b/openssh/version.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: version.h,v 1.52 2008/03/27 00:16:49 djm Exp $ */
+/* $OpenBSD: version.h,v 1.53 2008/04/03 09:50:14 djm Exp $ */
 
 #ifdef GSI
 #define GSI_VERSION	" GSI"
@@ -20,7 +20,7 @@
 
 #define NCSA_VERSION	" NCSA_GSSAPI_20080401"
 
-#define SSH_VERSION	"OpenSSH_4.9"
+#define SSH_VERSION	"OpenSSH_5.0"
 
 #define SSH_PORTABLE	"p1"
 #define SSH_HPN         "-hpn13v1"