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

Merge branch 'master' into topic/vern/script-inlining

Browse source
This commit is contained in:
Jon Siwek 2020-12-04 16:18:14 -08:00
commit ff7d9e3d72
144 changed files with 1930 additions and 1263 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/zeek-setup.cc
View file

@ -606,17 +606,8 @@ SetupResult setup(int argc, char** argv, Options* zopts)
file_mgr->InitPreScript();
zeekygen_mgr->InitPreScript();
bool missing_plugin = false;
for ( set<string>::const_iterator i = requested_plugins.begin();
i != requested_plugins.end(); i++ )
{
if ( ! plugin_mgr->ActivateDynamicPlugin(*i) )
missing_plugin = true;
}
if ( missing_plugin )
reporter->FatalError("Failed to activate requested dynamic plugin(s).");
for ( const auto& x : requested_plugins )
plugin_mgr->ActivateDynamicPlugin(std::move(x));
plugin_mgr->ActivateDynamicPlugins(! options.bare_mode);