summaryrefslogtreecommitdiff
path: root/openbsd-compat
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2018-04-13 13:38:06 +1000
committerDamien Miller <djm@mindrot.org>2018-04-13 13:38:06 +1000
commitcfb1d9bc76734681e3dea532a1504fcd466fbe91 (patch)
treeecc9ee1f27227c9f4e75c176fcf74fc9b6c63a0a /openbsd-compat
parentafa6e79b76fb52a0c09a29688b5c0d125eb08302 (diff)
downloadopenssh-git-cfb1d9bc76734681e3dea532a1504fcd466fbe91.tar.gz
Fix tunnel forwarding broken in 7.7p1
bz2855, ok dtucker@
Diffstat (limited to 'openbsd-compat')
-rw-r--r--openbsd-compat/port-net.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/openbsd-compat/port-net.c b/openbsd-compat/port-net.c
index 7050629c..bb535626 100644
--- a/openbsd-compat/port-net.c
+++ b/openbsd-compat/port-net.c
@@ -185,7 +185,7 @@ sys_tun_open(int tun, int mode, char **ifname)
else
debug("%s: %s mode %d fd %d", __func__, ifr.ifr_name, mode, fd);
- if (ifname != NULL && (*ifname = strdup(ifr.ifr_name)))
+ if (ifname != NULL && (*ifname = strdup(ifr.ifr_name)) == NULL)
goto failed;
return (fd);
@@ -272,7 +272,7 @@ sys_tun_open(int tun, int mode, char **ifname)
goto failed;
}
- if (ifname != NULL && (*ifname = strdup(ifr.ifr_name)))
+ if (ifname != NULL && (*ifname = strdup(ifr.ifr_name)) == NULL)
goto failed;
close(sock);