Date: Wed, 16 May 2018 13:59:58 +0000 (UTC) From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= <des@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r333676 - vendor-crypto/openssh/dist/openbsd-compat Message-ID: <201805161359.w4GDxwvr007097@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: des Date: Wed May 16 13:59:58 2018 New Revision: 333676 URL: https://svnweb.freebsd.org/changeset/base/333676 Log: Import upstream commit cfb1d9b, which fixes tunnel forwarding. Modified: vendor-crypto/openssh/dist/openbsd-compat/port-net.c Modified: vendor-crypto/openssh/dist/openbsd-compat/port-net.c ============================================================================== --- vendor-crypto/openssh/dist/openbsd-compat/port-net.c Wed May 16 13:52:24 2018 (r333675) +++ vendor-crypto/openssh/dist/openbsd-compat/port-net.c Wed May 16 13:59:58 2018 (r333676) @@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805161359.w4GDxwvr007097>