--- gvpe/src/vpn.C	2005/03/26 03:16:24	1.34
+++ gvpe/src/vpn.C	2005/04/26 00:55:56	1.38
@@ -16,7 +16,7 @@
  
     You should have received a copy of the GNU General Public License
     along with gvpe; if not, write to the Free Software
-    Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "config.h"
@@ -110,6 +110,7 @@
         return -1;
 
       fcntl (ipv4_fd, F_SETFL, O_NONBLOCK);
+      fcntl (ipv4_fd, F_SETFD, FD_CLOEXEC);
 
 #if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
       // this I really consider a linux bug. I am neither connected
@@ -142,6 +143,7 @@
         return -1;
 
       fcntl (udpv4_fd, F_SETFL, O_NONBLOCK);
+      fcntl (udpv4_fd, F_SETFD, FD_CLOEXEC);
 
       // standard daemon practise...
       {
@@ -181,6 +183,7 @@
         return -1;
 
       fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK);
+      fcntl (icmpv4_fd, F_SETFD, FD_CLOEXEC);
 
 #ifdef ICMP_FILTER
       {
@@ -199,7 +202,7 @@
       // fragment for me sometimes.
       {
         int oval = IP_PMTUDISC_DONT;
-        setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
+        setsockopt (icmpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
       }
 #endif
 
@@ -226,6 +229,7 @@
         return -1;
 
       fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK);
+      fcntl (tcpv4_fd, F_SETFD, FD_CLOEXEC);
 
       // standard daemon practise...
       {
@@ -261,15 +265,18 @@
       if (dnsv4_fd < 0)
         return -1;
 
-#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
+      fcntl (dnsv4_fd, F_SETFL, O_NONBLOCK);
+      fcntl (dnsv4_fd, F_SETFD, FD_CLOEXEC);
+
+# if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
       // this I really consider a linux bug. I am neither connected
       // nor do I fragment myself. Linux still sets DF and doesn't
       // fragment for me sometimes.
       {
         int oval = IP_PMTUDISC_DONT;
-        setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
+        setsockopt (dnsv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
       }
-#endif
+# endif
 
       // standard daemon practise...
       {
@@ -304,6 +311,8 @@
       exit (EXIT_FAILURE);
     }
   
+  fcntl (tap->fd, F_SETFD, FD_CLOEXEC);
+
   if (tap->if_up () &&
       !run_script (run_script_cb (this, &vpn::script_if_init), true))
     {