starter: Don't flush SAs in the kernel

If starter is not used we don't do that either. And this allows us to
move the stuff in libhydra back to libcharon.

diff --git a/src/starter/netkey.c b/src/starter/netkey.c
index 0b677fb79287758c0c3f523390f1f7814ec7ba47..3eb6973a1c8c1ae5c52d42cc548ab29cb0c5cd99 100644 (file)
--- a/src/starter/netkey.c
+++ b/src/starter/netkey.c
@@ -55,15 +55,3 @@ bool starter_netkey_init(void)
        DBG2(DBG_APP, "found netkey IPsec stack");
        return TRUE;
 }
-
-void starter_netkey_cleanup(void)
-{
-       if (!lib->plugins->load(lib->plugins,
-                       lib->settings->get_str(lib->settings, "starter.load", PLUGINS)))
-       {
-               DBG1(DBG_APP, "unable to load kernel plugins");
-               return;
-       }
-       hydra->kernel_interface->flush_sas(hydra->kernel_interface);
-       lib->plugins->unload(lib->plugins);
-}

diff --git a/src/starter/netkey.h b/src/starter/netkey.h
index c12924174295ac1e8b9b6f1b5054e4255692466d..bc71af2ed2bb557bec917ec7446dc7cbce135459 100644 (file)
--- a/src/starter/netkey.h
+++ b/src/starter/netkey.h
@@ -16,7 +16,6 @@
 #define _STARTER_NETKEY_H_
 
 extern bool starter_netkey_init (void);
-extern void starter_netkey_cleanup (void);
 
 #endif /* _STARTER_NETKEY_H_ */
 

diff --git a/src/starter/starter.c b/src/starter/starter.c
index a1929892309ac67a680bb3adb45506c6477c6fa6..ab1ebdd5df53cab81796c886dfdcd041bdd47835 100644 (file)
--- a/src/starter/starter.c
+++ b/src/starter/starter.c
@@ -703,7 +703,6 @@ int main (int argc, char **argv)
                        {
                                starter_stop_charon();
                        }
-                       starter_netkey_cleanup();
                        confread_free(cfg);
                        unlink(starter_pid_file);
                        cleanup();