mirror of
git://slackware.nl/current.git
synced 2025-01-13 08:01:53 +01:00
37 lines
1 KiB
Diff
37 lines
1 KiB
Diff
|
From cfb1d9bc76734681e3dea532a1504fcd466fbe91 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Damien Miller <djm@mindrot.org>
|
||
|
|
Date: Fri, 13 Apr 2018 13:38:06 +1000
|
||
|
|
Subject: Fix tunnel forwarding broken in 7.7p1
|
||
|
|
|
||
|
|
bz2855, ok dtucker@
|
||
|
|
---
|
||
|
|
openbsd-compat/port-net.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/openbsd-compat/port-net.c b/openbsd-compat/port-net.c
|
||
|
|
index 7050629..bb53562 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);
|
||
|
|
--
|
||
|
|
cgit v1.1
|
||
|
|
|
||
|
|
|