Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-04 15:48:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote branch 'origin/master' into topic/policy-scripts-new

Browse source 
Conflicts:
	policy/bro.init
	testing/btest/language/rare-events.bro
This commit is contained in:
Seth Hall 2011-06-25 23:49:20 -04:00
commit c070cb31da
28 changed files with 381 additions and 412 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main.cc
View file

@ -886,7 +886,8 @@ int main(int argc, char** argv)
UnserialInfo info(&s);
info.print = stdout;
info.install_uniques = true;
s.Read(&info, bst_file);
if ( ! s.Read(&info, bst_file) )
error("Failed to read events from %s\n", bst_file);
}
exit(0);