X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=unixsocketwatcher.ml;h=99fe554190da248b587779f9db811c8e78c99d44;hb=4d3b3106c2210fa433241a91a7aae34e7840ba64;hp=517d7e0e6eed60513fc9555ec11a6b9e288c5d2a;hpb=a9b075f4f7ff0f7507fd7b9f1f8a3fad46f2db99;p=vsys.git

diff --git a/unixsocketwatcher.ml b/unixsocketwatcher.ml
index 517d7e0..99fe554 100644
--- a/unixsocketwatcher.ml
+++ b/unixsocketwatcher.ml
@@ -13,6 +13,8 @@ open Globals
 open Fdwatcher
 open Printf
 
+exception Exec_failed
+
 let close_if_open fd = (try (ignore(close fd);) with _ -> ())
 
 type control_path_name = string
@@ -44,11 +46,19 @@ let receive_event (listening_socket_spec:fname_and_fd) (_:fname_and_fd) =
                       (* Close all fds except for the socket *)
                       let fd = Obj.magic data_socket in
                         let _ = 
-                            execv execpath [|execpath;slice_name;sprintf "%d" fd|] (*with
+                          (* Close fds *)
+                          for i = 3 to 1023 do
+                            if (i != fd) then close_if_open(Obj.magic i)
+                          done;
+                            execv execpath [|execpath;slice_name;sprintf "%d" fd|];
+                            raise Exec_failed
+                        (*with
                                 Unix_error(num,str1,str2)->logprint "Error %d: %s (%s)" (Obj.magic num) str1 str2;raise (Unix_error(num,str1,str2))*)
                         in
                             logprint "Could not execve %s" execpath
                     end
+                  else
+                    close_if_open(data_socket)
               end
           | None -> ()
     with e-> logprint "Error accepting socket\n"