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

Fix -N option to work with builtin plugins as well.

Browse source
This commit is contained in:
Robin Sommer 2015-04-23 07:10:36 -07:00
parent 0cc49b8769
commit 7d95ebb48a
3 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,4 +1,8 @@
2.3-883 | 2015-04-23 07:10:36 -0700
* Fix -N option to work with builtin plugins as well. (Robin Sommer)
2.3-882 | 2015-04-23 06:59:40 -0700 2.3-882 | 2015-04-23 06:59:40 -0700
* Add missing .pac dependencies for some binpac analyzer targets. * Add missing .pac dependencies for some binpac analyzer targets.

2
VERSION
View file

@ -1 +1 @@
2.3-882 2.3-883

11
src/plugin/Manager.cc
View file

@ -143,6 +143,17 @@ bool Manager::ActivateDynamicPluginInternal(const std::string& name, bool ok_if_
if ( ok_if_not_found ) if ( ok_if_not_found )
return true; return true;
// Check if it's a static built-in plugin; they are always
// active, so just ignore. Not the most efficient way, but
// this should be rare to begin with.
plugin_list* all_plugins = Manager::ActivePluginsInternal();
for ( plugin::Manager::plugin_list::const_iterator i = all_plugins->begin(); i != all_plugins->end(); i++ )
{
if ( (*i)->Name() == name )
return true;
}
reporter->Error("plugin %s is not available", name.c_str()); reporter->Error("plugin %s is not available", name.c_str());
return false; return false;
} }