open Fdwatcher
open Printf
+exception Exec_failed
+
let close_if_open fd = (try (ignore(close fd);) with _ -> ())
type control_path_name = string
|None -> logprint "Received unexpected socket event\n";()
|Some (execpath, slice_name) ->
begin
- let child = fork () in
+ let child = try fork () with _ -> -1 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(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"
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
(** 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