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

Added --include-plugins configure argument

Browse source
This commit is contained in:
Seth Hall 2021-02-16 10:59:05 -05:00 • committed by Tim Wojtulewicz
parent e0d284ec9f
commit e399b537ca
11 changed files with 146 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/zeek-setup.cc
View file

@ -413,9 +413,6 @@ SetupResult setup(int argc, char** argv, Options* zopts)
// options from deep within some modules.
analysis_options = options.analysis_options;
if ( options.print_usage )
usage(argv[0], 0);
if ( options.print_version )
{
fprintf(stdout, "%s version %s\n", argv[0], zeek_version());
@ -551,6 +548,8 @@ SetupResult setup(int argc, char** argv, Options* zopts)
if ( ! options.bare_mode )
add_input_file("base/init-default.zeek");
add_input_file("builtin-plugins/__load__.zeek");
plugin_mgr->SearchDynamicPlugins(util::zeek_plugin_path());
if ( options.plugins_to_load.empty() && options.scripts_to_load.empty() &&
@ -598,6 +597,13 @@ SetupResult setup(int argc, char** argv, Options* zopts)
file_mgr->InitPreScript();
zeekygen_mgr->InitPreScript();
// This has to happen before ActivateDynamicPlugin() below or the list of plugins in the
// 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));