X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=backend.ml;h=3d1122a9a7edf57de241feb961c9c40c03d4a39e;hb=fa2fedc9aa9d571c5907d9b71908beb9f46489fb;hp=b2c3d24984dc3705932573a5b13927deeb747478;hpb=2fa80a7145ccec83abc2fb32a709292af9960bcc;p=vsys.git diff --git a/backend.ml b/backend.ml index b2c3d24..3d1122a 100644 --- a/backend.ml +++ b/backend.ml @@ -41,7 +41,7 @@ class backendHandler dir_root (frontend_lst: frontendHandler list) = (** Regular expression that defines a legal script name. Filter out * temporary files using it *) - 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$" (** Somebody created a new directory *) @@ -84,7 +84,7 @@ class backendHandler dir_root (frontend_lst: frontendHandler list) = with _ -> None - method is_acl fname = Str.string_match acl_file_regexp fname 1 + method is_acl fname = Str.string_match acl_file_regexp fname 0 (** Gets called every time there's an inotify event at the backend @param dirname Name of the backend directory @@ -131,7 +131,7 @@ class backendHandler dir_root (frontend_lst: frontendHandler list) = end end else (* regex not matched *) - fprintf logfd "Rejected weird entry %s\n" fname + logprint "Rejected weird entry %s\n" fname (** Initializer - build the initial tree based on the contents of /vsys *) initializer