diff options
Diffstat (limited to 'src/libstrongswan/plugins/ldap/ldap_plugin.c')
| -rw-r--r-- | src/libstrongswan/plugins/ldap/ldap_plugin.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/libstrongswan/plugins/ldap/ldap_plugin.c b/src/libstrongswan/plugins/ldap/ldap_plugin.c index 3682ddd1f..434a023ce 100644 --- a/src/libstrongswan/plugins/ldap/ldap_plugin.c +++ b/src/libstrongswan/plugins/ldap/ldap_plugin.c @@ -31,8 +31,15 @@ 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, destroy, void, private_ldap_plugin_t *this) +>>>>>>> upstream/4.5.1 { lib->fetcher->remove_fetcher(lib->fetcher, (fetcher_constructor_t)ldap_fetcher_create); @@ -44,6 +51,11 @@ 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, @@ -53,6 +65,7 @@ plugin_t *ldap_plugin_create() }, }, ); +>>>>>>> upstream/4.5.1 lib->fetcher->add_fetcher(lib->fetcher, (fetcher_constructor_t)ldap_fetcher_create, "ldap://"); |