Merge remote-tracking branch 'origin/topic/seth/files-tracking' into topic/vladg/smb

This commit is contained in:
Vlad Grigorescu 2014-10-08 10:54:56 -04:00
commit e9c398a41c
55 changed files with 871 additions and 597 deletions

View file

@ -289,8 +289,8 @@ event Intel::match(s: Seen, items: set[Item]) &priority=5
if ( ! info?$fuid )
info$fuid = s$f$id;
if ( ! info?$file_mime_type && s$f?$mime_type )
info$file_mime_type = s$f$mime_type;
if ( ! info?$file_mime_type && s$f?$info && s$f$info?$mime_type )
info$file_mime_type = s$f$info$mime_type;
if ( ! info?$file_desc )
info$file_desc = Files::describe(s$f);