Fixes for the builtin plugin functionality

This commit is contained in:
Seth Hall 2021-06-11 17:52:27 +00:00
parent 623f2b4e71
commit 8222193525
5 changed files with 16 additions and 18 deletions

View file

@ -601,14 +601,15 @@ SetupResult setup(int argc, char** argv, Options* zopts)
// manager will be missing the plugins we want to try to add to the path.
plugin_mgr->ExtendZeekPathForPlugins();
if ( options.print_usage )
usage(argv[0], 0);
for ( const auto& x : requested_plugins )
plugin_mgr->ActivateDynamicPlugin(std::move(x));
plugin_mgr->ActivateDynamicPlugins(! options.bare_mode);
// Print usage after plugins load so that any path extensions are properly shown.
if ( options.print_usage )
usage(argv[0], 0);
init_event_handlers();
md5_type = make_intrusive<OpaqueType>("md5");