mirror of
git://slackware.nl/current.git
synced 2024-12-29 10:25:00 +01:00
646a5c1cbf
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
36 lines
1 KiB
Diff
36 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
|
|
|
|
|