diff options
Diffstat (limited to 'src/libstrongswan/plugins/ldap/ldap_plugin.c')
| -rw-r--r-- | src/libstrongswan/plugins/ldap/ldap_plugin.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/src/libstrongswan/plugins/ldap/ldap_plugin.c b/src/libstrongswan/plugins/ldap/ldap_plugin.c index 434a023ce..08d9748ce 100644 --- a/src/libstrongswan/plugins/ldap/ldap_plugin.c +++ b/src/libstrongswan/plugins/ldap/ldap_plugin.c @@ -31,15 +31,14 @@ struct private_ldap_plugin_t { ldap_plugin_t public; }; -<<<<<<< HEAD -/** - * Implementation of ldap_plugin_t.destroy - */ -static void destroy(private_ldap_plugin_t *this) -======= +METHOD(plugin_t, get_name, char*, + private_ldap_plugin_t *this) +{ + return "ldap"; +} + METHOD(plugin_t, destroy, void, private_ldap_plugin_t *this) ->>>>>>> upstream/4.5.1 { lib->fetcher->remove_fetcher(lib->fetcher, (fetcher_constructor_t)ldap_fetcher_create); @@ -51,21 +50,17 @@ METHOD(plugin_t, destroy, void, */ plugin_t *ldap_plugin_create() { -<<<<<<< HEAD - private_ldap_plugin_t *this = malloc_thing(private_ldap_plugin_t); - - this->public.plugin.destroy = (void(*)(plugin_t*))destroy; -======= private_ldap_plugin_t *this; INIT(this, .public = { .plugin = { + .get_name = _get_name, + .reload = (void*)return_false, .destroy = _destroy, }, }, ); ->>>>>>> upstream/4.5.1 lib->fetcher->add_fetcher(lib->fetcher, (fetcher_constructor_t)ldap_fetcher_create, "ldap://"); |