5 files changed, 33 insertions, 3 deletions

diff --git a/channels.c b/channels.c
index e741f29b9..8e66265a3 100644
--- a/channels.c
+++ b/channels.c
@@ -1386,7 +1386,7 @@ port_open_helper(Channel *c, char *rtype)
         int direct;
         char buf[1024];
         char *local_ipaddr = get_local_ipaddr(c->sock);
-        int local_port = get_sock_port(c->sock, 1);
+        int local_port = c->sock == -1 ? 65536 : get_sock_port(c->sock, 1);
         char *remote_ipaddr = get_peer_ipaddr(c->sock);
         int remote_port = get_peer_port(c->sock);
 
diff --git a/debian/.git-dpm b/debian/.git-dpm
index 5a2f70e06..f021dddb0 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-bdb60d16baf6d163844fc6f5f8520bc853b6611b
-bdb60d16baf6d163844fc6f5f8520bc853b6611b
+18e1479bf4586a14b88dab082af10a8981b9d48d
+18e1479bf4586a14b88dab082af10a8981b9d48d
 9a975a9faed7c4f334e8c8490db3e77e102f2b21
 9a975a9faed7c4f334e8c8490db3e77e102f2b21
 openssh_6.5p1.orig.tar.gz
diff --git a/debian/changelog b/debian/changelog
index 6523de8a8..0cd7b9594 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ openssh (1:6.5p1-4) UNRELEASED; urgency=medium
     symlinks that won't work with dependency-based sysv-rc.
   * Remove code related to non-dependency-based sysv-rc ordering, since that
     is no longer supported.
+  * Apply patch from https://bugzilla.mindrot.org/show_bug.cgi?id=2200 to
+    fix getsockname errors when using "ssh -W" (closes: #738693).
 
  -- Colin Watson <cjwatson@debian.org>  Thu, 13 Feb 2014 10:53:22 +0000
 
diff --git a/debian/patches/getsockname-error.patch b/debian/patches/getsockname-error.patch
new file mode 100644
index 000000000..b4dbc2c9f
--- /dev/null
+++ b/debian/patches/getsockname-error.patch
@@ -0,0 +1,27 @@
+From 18e1479bf4586a14b88dab082af10a8981b9d48d Mon Sep 17 00:00:00 2001
+From: Damien Miller <djm@mindrot.org>
+Date: Sat, 15 Feb 2014 02:08:20 +0000
+Subject: Skip get_sock_port call for c->sock==-1
+
+Origin: upstream, https://bugzilla.mindrot.org/show_bug.cgi?id=2200
+Bug-Debian: http://bugs.debian.org/738693
+Last-Update: 2014-02-15
+
+Patch-Name: getsockname-error.patch
+---
+ channels.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/channels.c b/channels.c
+index e741f29..8e66265 100644
+--- a/channels.c
++++ b/channels.c
+@@ -1386,7 +1386,7 @@ port_open_helper(Channel *c, char *rtype)
+        int direct;
+        char buf[1024];
+        char *local_ipaddr = get_local_ipaddr(c->sock);
+-       int local_port = get_sock_port(c->sock, 1);
++       int local_port = c->sock == -1 ? 65536 : get_sock_port(c->sock, 1);
+        char *remote_ipaddr = get_peer_ipaddr(c->sock);
+        int remote_port = get_peer_port(c->sock);
+ 
diff --git a/debian/patches/series b/debian/patches/series
index f571f76a5..5048e254d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -27,3 +27,4 @@ gnome-ssh-askpass2-icon.patch
 sigstop.patch
 debian-config.patch
 fix-case-sensitive-matching.patch
+getsockname-error.patch