Author: des
Date: Wed May 16 14:04:39 2018
New Revision: 333677
URL: https://svnweb.freebsd.org/changeset/base/333677
Log:
Merge upstream patch to unbreak tunnel forwarding.
Reported by: cy@
Modified:
head/crypto/openssh/openbsd-compat/port-net.c
Modified: head/crypto/openssh/openbsd-compat/port-net.c
==============================================================================
--- head/crypto/openssh/openbsd-compat/port-net.c Wed May 16 13:59:58
2018 (r333676)
+++ head/crypto/openssh/openbsd-compat/port-net.c Wed May 16 14:04:39
2018 (r333677)
@@ -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);
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
