Starting fd-passing related changes again.

diff --git a/frontend.ml b/frontend.ml
index 9341633..56d1d9f 100644 (file)
--- a/frontend.ml
+++ b/frontend.ml
@@ -25,14 +25,6 @@ object(this)
     let realperm = perm land (lnot 0o111) in
       match rp with Relpath(rel) ->
         let fqp = String.concat "/" [root_dir;rel] in
-        let res = Directfifowatcher.mkentry fqp abspath realperm slice_name in
-          begin
-            match res with 
-              | Success ->
-                  Directfifowatcher.openentry root_dir fqp (abspath,slice_name)
-              | _ -> 
-                  logprint "Could not create entry %s" abspath
-          end;
           if (is_fd_passer rel) then
             let res = Unixsocketwatcher.mkentry fqp abspath realperm slice_name in
               begin
@@ -42,7 +34,16 @@ object(this)
                   | _ -> 
                       logprint "Could not create entry %s" abspath
               end
-
+              else
+                let res = Directfifowatcher.mkentry fqp abspath realperm slice_name in
+                  begin
+                    match res with 
+                      | Success ->
+                          Directfifowatcher.openentry root_dir fqp (abspath,slice_name)
+                      | _ -> 
+                          logprint "Could not create entry %s" abspath
+                  end
+