X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=fifowatcher.ml;h=dc79dad106f7da66f11bec29a23695460b80b3c7;hb=d549a9725e4e1f731a08a147a33d6f3a13c4e648;hp=646ec31e4dd54c2414317029d04c0bb27d8df7f2;hpb=4bb506215c662d430a339b7a3d24db10d43de61b;p=vsys.git

diff --git a/fifowatcher.ml b/fifowatcher.ml
index 646ec31..dc79dad 100644
--- a/fifowatcher.ml
+++ b/fifowatcher.ml
@@ -146,16 +146,24 @@ and receive_fifo_event eventdescriptor outdescriptor =
 
 
 (** Make a pair of fifo entries *)
-let mkentry fqp abspath perm = 
+let mkentry fqp abspath perm uname = 
   printf "Making entry %s->%s\n" fqp abspath;flush Pervasives.stdout;
   let fifoin=sprintf "%s.in" fqp in
   let fifoout=sprintf "%s.out" fqp in
     (try Unix.unlink fifoin with _ -> ());
     (try Unix.unlink fifoout with _ -> ());
     (try 
-       Unix.mkfifo (sprintf "%s.in" fqp) 0o666;
-       Unix.mkfifo (sprintf "%s.out" fqp) 0o666;
-       Success
+       let infname =(sprintf "%s.in" fqp) in
+       let outfname =(sprintf "%s.out" fqp) in
+         Unix.mkfifo infname 0o666;
+         Unix.mkfifo outfname 0o666;
+         ( (* Make the user the owner of the pipes in a non-chroot environment *)
+         if (!Globals.nochroot) then
+           let pwentry = Unix.getpwnam uname in
+             Unix.chown infname pwentry.pw_uid pwentry.pw_gid; 
+             Unix.chown outfname pwentry.pw_uid pwentry.pw_gid
+         );
+         Success
      with 
          e->printf "Error creating FIFO: %s->%s. May be something wrong at the frontend.\n" fqp fifoout;flush Pervasives.stdout;Failed)