X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=backend.ml;h=6743f8c1b6c7bf964c7d2c5ee54705cbc6a13f2e;hb=64fec94ca5bdf716a1a600579fb72cde60c9148a;hp=4d243266598bc5a18bd130359612fb4a60657d9d;hpb=59b750289e2b4e75e8a661045b16ce053326671d;p=vsys.git diff --git a/backend.ml b/backend.ml index 4d24326..6743f8c 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_"; @@ -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