(no commit message)

[vsys.git] / unixsocketwatcher.ml

diff --git a/unixsocketwatcher.ml b/unixsocketwatcher.ml
index ab3d5dc..fa46e69 100644 (file)
--- a/unixsocketwatcher.ml
+++ b/unixsocketwatcher.ml
@@ -40,10 +40,18 @@ let receive_event (listening_socket_spec:fname_and_fd) (_:fname_and_fd) =
                 let child = fork () in
                   if (child == 0) then
                     begin
-                      (*Child*)
+                      (* Child *)
                       (* Close all fds except for the socket *)
-                      ignore(execv execpath,[execpath,sprintf "%d" data_socket]);
-                      logprint "Could not execve %s" execpath
+                      let fd = Obj.magic data_socket in
+                        let _ = 
+                          (* Close fds *)
+                          for i = 3 to 1023 do
+                            if (i != fd) then close_if_open(i)
+                          done;
+                            execv execpath [|execpath;slice_name;sprintf "%d" fd|] (*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
               end
           | None -> ()
@@ -65,7 +73,7 @@ let mkentry fqp exec_fqp perm slice_name =
                 Unix.chown control_filename pwentry.pw_uid pwentry.pw_gid
           );
           Hashtbl.replace unix_socket_table_fname control_filename (Some(listening_socket));
-          Hashtbl.replace unix_socket_table_fd listening_socket Some(control_filename,slice_name);
+          Hashtbl.replace unix_socket_table_fd listening_socket (Some(exec_fqp,slice_name));
           Fdwatcher.add_fd (None,listening_socket) (None,listening_socket) receive_event;
           Success
     with 
@@ -75,14 +83,14 @@ let mkentry fqp exec_fqp perm slice_name =
 (** Close sockets that just got removed *)
 let closeentry fqp =
   let control_filename = String.concat "." [fqp;"control"] in
-  let entry = try Hashtbl.find unix_socket_table_fname Some(control_filename) with Not_found -> None in
+  let entry = try Hashtbl.find unix_socket_table_fname control_filename with Not_found -> None in
     match entry with
       | None -> ()
       | Some(fd) -> 
-          Hashtbl.remove unix_socket_table fd;
+          Hashtbl.remove unix_socket_table_fd fd;
           shutdown fd SHUTDOWN_ALL;
           close_if_open fd;
-          Hashtbl.remove unix_socket_table control_filename
+          Hashtbl.remove unix_socket_table_fname control_filename