Contents of /trunk/openssh/patches/openssh-7.7p1-tuntap.patch
Parent Directory | Revision Log
Revision 3140 -
(show annotations)
(download)
Tue Jun 19 12:25:39 2018 UTC (6 years, 3 months ago) by niro
File size: 1029 byte(s)
Tue Jun 19 12:25:39 2018 UTC (6 years, 3 months ago) by niro
File size: 1029 byte(s)
-fix broken tunnel forwarding
1 | From cfb1d9bc76734681e3dea532a1504fcd466fbe91 Mon Sep 17 00:00:00 2001 |
2 | From: Damien Miller <djm@mindrot.org> |
3 | Date: Fri, 13 Apr 2018 13:38:06 +1000 |
4 | Subject: Fix tunnel forwarding broken in 7.7p1 |
5 | |
6 | bz2855, ok dtucker@ |
7 | --- |
8 | openbsd-compat/port-net.c | 4 ++-- |
9 | 1 file changed, 2 insertions(+), 2 deletions(-) |
10 | |
11 | diff --git a/openbsd-compat/port-net.c b/openbsd-compat/port-net.c |
12 | index 7050629..bb53562 100644 |
13 | --- a/openbsd-compat/port-net.c |
14 | +++ b/openbsd-compat/port-net.c |
15 | @@ -185,7 +185,7 @@ sys_tun_open(int tun, int mode, char **ifname) |
16 | else |
17 | debug("%s: %s mode %d fd %d", __func__, ifr.ifr_name, mode, fd); |
18 | |
19 | - if (ifname != NULL && (*ifname = strdup(ifr.ifr_name))) |
20 | + if (ifname != NULL && (*ifname = strdup(ifr.ifr_name)) == NULL) |
21 | goto failed; |
22 | |
23 | return (fd); |
24 | @@ -272,7 +272,7 @@ sys_tun_open(int tun, int mode, char **ifname) |
25 | goto failed; |
26 | } |
27 | |
28 | - if (ifname != NULL && (*ifname = strdup(ifr.ifr_name))) |
29 | + if (ifname != NULL && (*ifname = strdup(ifr.ifr_name)) == NULL) |
30 | goto failed; |
31 | |
32 | close(sock); |
33 | -- |
34 | cgit v1.1 |
35 |