2 files changed, 10 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 3bb45baff..184c36980 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
 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
  - OpenBSD CVS Sync
    - djm@cvs.openbsd.org 2010/08/08 16:26:42
      [version.h]
diff --git a/openbsd-compat/port-tun.c b/openbsd-compat/port-tun.c
index ddc92d0f3..0d756f74f 100644
--- a/openbsd-compat/port-tun.c
+++ b/openbsd-compat/port-tun.c
@@ -173,9 +173,11 @@ sys_tun_open(int tun, int mode)
 
         if (ioctl(sock, SIOCGIFFLAGS, &ifr) == -1)
                 goto failed;
-        ifr.ifr_flags |= IFF_UP;
-        if (ioctl(sock, SIOCSIFFLAGS, &ifr) == -1)
-                goto failed;
+        if ((ifr.ifr_flags & IFF_UP) == 0) {
+                ifr.ifr_flags |= IFF_UP;
+                if (ioctl(sock, SIOCSIFFLAGS, &ifr) == -1)
+                        goto failed;
+        }
 
         close(sock);
         return (fd);