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

Remove support for .bro script extension and BRO_ environment variables

Browse source
This commit is contained in:
Tim Wojtulewicz 2021-01-25 14:46:47 -07:00
parent 44ad614094
commit 725e759560
11 changed files with 33 additions and 171 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/plugin/Manager.cc
View file

@ -257,44 +257,29 @@ bool Manager::ActivateDynamicPluginInternal(const std::string& name, bool ok_if_
string init;
// First load {scripts}/__preload__.zeek automatically.
for (const string& ext : util::detail::script_extensions)
{
init = dir + "scripts/__preload__" + ext;
init = dir + "scripts/__preload__.zeek";
if ( util::is_file(init) )
{
DBG_LOG(DBG_PLUGINS, " Loading %s", init.c_str());
util::detail::warn_if_legacy_script(init);
scripts_to_load.push_back(init);
break;
}
if ( util::is_file(init) )
{
DBG_LOG(DBG_PLUGINS, " Loading %s", init.c_str());
scripts_to_load.push_back(init);
}
// Load {bif,scripts}/__load__.zeek automatically.
for (const string& ext : util::detail::script_extensions)
{
init = dir + "lib/bif/__load__" + ext;
init = dir + "lib/bif/__load__.zeek";
if ( util::is_file(init) )
{
DBG_LOG(DBG_PLUGINS, " Loading %s", init.c_str());
util::detail::warn_if_legacy_script(init);
scripts_to_load.push_back(init);
break;
}
if ( util::is_file(init) )
{
DBG_LOG(DBG_PLUGINS, " Loading %s", init.c_str());
scripts_to_load.push_back(init);
}
for (const string& ext : util::detail::script_extensions)
{
init = dir + "scripts/__load__" + ext;
init = dir + "scripts/__load__.zeek";
if ( util::is_file(init) )
{
DBG_LOG(DBG_PLUGINS, " Loading %s", init.c_str());
util::detail::warn_if_legacy_script(init);
scripts_to_load.push_back(init);
break;
}
if ( util::is_file(init) )
{
DBG_LOG(DBG_PLUGINS, " Loading %s", init.c_str());
scripts_to_load.push_back(init);
}
// Mark this plugin as activated by clearing the path.