merged OpenSSH 5.0p1 to trunk

diff --git a/openssh/channels.c b/openssh/channels.c
index 87dcb730f177a0130be91402649ace3bf06a42a9..6bd6b14e82976c87d069cebe06966b4773faf600 100644 (file)
--- 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 3bdc05aa20b8dc14a8d0aad638eedc1faba3ca84..c9476ade37d950a07baa95ce4ccfa01825ba0d31 100644 (file)
--- 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 a8021b99707f996f720c69775b6ab6d466ca2ed3..68ef0edc8fe2ca2538891a2fa2eb7ae2d07fc26f 100644 (file)
--- 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"