X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=unixsocketwatcher.ml;h=517d7e0e6eed60513fc9555ec11a6b9e288c5d2a;hb=a9b075f4f7ff0f7507fd7b9f1f8a3fad46f2db99;hp=1634c499a1609a5aacdb60ec879c8bfe7e4960f8;hpb=7798e1ecdcb15ee767fcbed9c6f59a2ddaf1613d;p=vsys.git diff --git a/unixsocketwatcher.ml b/unixsocketwatcher.ml index 1634c49..517d7e0 100644 --- a/unixsocketwatcher.ml +++ b/unixsocketwatcher.ml @@ -40,10 +40,14 @@ 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" (Obj.magic data_socket)]); - logprint "Could not execve %s" execpath + let fd = Obj.magic data_socket in + let _ = + 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 +69,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