X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=backend.ml;h=2f964ef88103172dceee41592d0a0afc103e8021;hb=8e6d6b1bc68769939d544a629936ac58b8a74449;hp=6bf6796981b99833fb2919392a47640d84eb4aea;hpb=46e48c60e9d524bf71631561e193c443613a2bb5;p=vsys.git

diff --git a/backend.ml b/backend.ml
index 6bf6796..2f964ef 100644
--- a/backend.ml
+++ b/backend.ml
@@ -46,7 +46,7 @@ class backendHandler dir_root (frontend_lst: frontendHandler list) =
 
      (** Regular expression that defines a legal script name. Filter out
        * temporary files using this *)
-     val file_regexp = Str.regexp "[a-zA-Z][a-zA-Z0-9_\.]*"
+     val file_regexp = Str.regexp "^[a-zA-Z][a-zA-Z0-9_\.\-]*$"
      val acl_file_regexp = Str.regexp ".*acl$"
 
      val dir_regexp = Str.regexp "^dir_";
@@ -84,7 +84,7 @@ class backendHandler dir_root (frontend_lst: frontendHandler list) =
              with _ -> None
            in
              match next_item with
-               | None -> cur_filter
+               | None -> close_in acl_file;cur_filter
                | Some(item) -> 
                    Hashtbl.add cur_filter item true;
                    read_acl cur_filter
@@ -109,7 +109,7 @@ class backendHandler dir_root (frontend_lst: frontendHandler list) =
              let acl_filter = this#make_filter acl_fqp in
              let slice_list = 
                match acl_filter with
-                 | None -> frontend_lst 
+                 | None -> [] (* No ACL *) 
                  | Some(filter) -> List.filter (fun fe->Hashtbl.mem filter (fe#get_slice_name ())) frontend_lst 
              in 
              let is_event = list_check evlist in
@@ -162,7 +162,7 @@ class backendHandler dir_root (frontend_lst: frontendHandler list) =
              let acl_filter = this#make_filter acl_fqp in
              let slice_list = 
                match acl_filter with
-                 | None -> frontend_lst 
+                 | None -> [] (*frontend_lst -> No ACL => No Show *)
                  | Some(filter) -> List.filter (fun fe->Hashtbl.mem filter (fe#get_slice_name ())) frontend_lst 
              in
                if (Str.string_match file_regexp curfile 0) then