summaryrefslogtreecommitdiffstats
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:39:54 +1000
commitb81b2d120e9c8a83489e241620843687758925ad (patch)
tree46a51a6be053ec6321d05625bc35388e78e4ba5c
parent4f60e4f66b5880c9f50ef758e8b7f7a9ae786d21 (diff)
Fix tunnel forwarding broken in 7.7p1
bz2855, ok dtucker@
-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);