From 409e462badfb6698a2ae4b0f2a860a57d26ff95c Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Thu, 2 Jul 2020 20:55:21 +0200 Subject: [PATCH] src/daemon/configfile.c: Remove special case for the "libvirt" plugin. --- src/daemon/configfile.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/daemon/configfile.c b/src/daemon/configfile.c index 61fa9013f..4d40a7784 100644 --- a/src/daemon/configfile.c +++ b/src/daemon/configfile.c @@ -350,17 +350,7 @@ static int dispatch_block_plugin(oconfig_item_t *ci) { return -1; } - const char *plugin_name = ci->values[0].value.string; - if (strcmp("libvirt", plugin_name) == 0) { - /* TODO(octo): Remove this legacy. */ - WARNING("The \"libvirt\" plugin has been renamed to \"virt\" to avoid " - "problems with the build system. " - "Your configuration is still using the old name. " - "Please change it to use \"virt\" as soon as possible. " - "This compatibility code will go away eventually."); - plugin_name = "virt"; - } - + char const *plugin_name = ci->values[0].value.string; bool plugin_loaded = plugin_is_loaded(plugin_name); if (!plugin_loaded && IS_TRUE(global_option_get("AutoLoadPlugin"))) { @@ -813,7 +803,7 @@ static oconfig_item_t *cf_read_generic(const char *path, const char *pattern, return root; } /* oconfig_item_t *cf_read_generic */ - /* #endif HAVE_WORDEXP_H */ +/* #endif HAVE_WORDEXP_H */ #else /* if !HAVE_WORDEXP_H */ static oconfig_item_t *cf_read_generic(const char *path, const char *pattern, -- 2.47.2