diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2018-05-16 13:59:58 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2018-05-16 13:59:58 +0000 |
| commit | 3d0e42005d3bf786341ab96cfa1788bc601faa12 (patch) | |
| tree | 2fba94e49b2d95243d414fb515ddd5264d4c2ffd | |
| parent | c8a2bf14627149859c5fed86cf127096c4fa2870 (diff) | |
| download | src-3d0e42005d3bf786341ab96cfa1788bc601faa12.tar.gz src-3d0e42005d3bf786341ab96cfa1788bc601faa12.zip | |
Import upstream commit cfb1d9b, which fixes tunnel forwarding.
Notes
Notes:
svn path=/vendor-crypto/openssh/dist/; revision=333676
| -rw-r--r-- | openbsd-compat/port-net.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openbsd-compat/port-net.c b/openbsd-compat/port-net.c index 7050629c31f7..bb535626ffe0 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); |