tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (djm) bz#1561: don't bother setting IFF_UP on tun(4) device if it is 

already set. Makes FreeBSD user openable tunnels useful; patch from
   richard.burakowski+ossh AT mrburak.net, ok dtucker@
This commit is contained in:
Damien Miller 2010-08-10 12:47:40 +10:00
parent 792010bafd
commit 2c4b13aa32
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
20100809
- (djm) bz#1561: don't bother setting IFF_UP on tun(4) device if it is
already set. Makes FreeBSD user openable tunnels useful; patch from
richard.burakowski+ossh AT mrburak.net, ok dtucker@
20100809 20100809
- OpenBSD CVS Sync - OpenBSD CVS Sync
- djm@cvs.openbsd.org 2010/08/08 16:26:42 - djm@cvs.openbsd.org 2010/08/08 16:26:42

8
openbsd-compat/port-tun.c
View File

@ -173,9 +173,11 @@ sys_tun_open(int tun, int mode)
if (ioctl(sock, SIOCGIFFLAGS, &ifr) == -1) if (ioctl(sock, SIOCGIFFLAGS, &ifr) == -1)
goto failed; goto failed;
ifr.ifr_flags |= IFF_UP; if ((ifr.ifr_flags & IFF_UP) == 0) {
if (ioctl(sock, SIOCSIFFLAGS, &ifr) == -1) ifr.ifr_flags |= IFF_UP;
goto failed; if (ioctl(sock, SIOCSIFFLAGS, &ifr) == -1)
goto failed;
}
close(sock); close(sock);
return (fd); return (fd);