aboutsummaryrefslogtreecommitdiffstats
path: root/src/charon-systemd/charon-systemd.c
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2016-03-03 17:39:27 +0100
committerTobias Brunner <tobias@strongswan.org>2016-03-03 17:39:58 +0100
commit88ce12a927f03d88f29609a46e7880dc0ecfb8be (patch)
tree7966167225b3e6f2ac51554f6092a28ab132c2b0 /src/charon-systemd/charon-systemd.c
parent91d80298f9de5e7d792b7cb0a6c7a2c61784d744 (diff)
parent28649f6d91971e0fe50078aec2937010e8c61cd8 (diff)
downloadstrongswan-88ce12a927f03d88f29609a46e7880dc0ecfb8be.tar.bz2
strongswan-88ce12a927f03d88f29609a46e7880dc0ecfb8be.tar.xz
Merge branch 'libhydra-bye-bye'
Moves kernel plugins to libcharon and removes the unused libhydra. The kernel interface is now accessible under charon->kernel.
Diffstat (limited to 'src/charon-systemd/charon-systemd.c')
-rw-r--r--src/charon-systemd/charon-systemd.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/charon-systemd/charon-systemd.c b/src/charon-systemd/charon-systemd.c
index 4286cde82..a83db5ac4 100644
--- a/src/charon-systemd/charon-systemd.c
+++ b/src/charon-systemd/charon-systemd.c
@@ -31,7 +31,6 @@
#include <systemd/sd-daemon.h>
#include <systemd/sd-journal.h>
-#include <hydra.h>
#include <daemon.h>
#include <library.h>
@@ -355,12 +354,6 @@ int main(int argc, char *argv[])
sd_notifyf(0, "STATUS=integrity check of charon-systemd failed");
return SS_RC_INITIALIZATION_FAILED;
}
- atexit(libhydra_deinit);
- if (!libhydra_init())
- {
- sd_notifyf(0, "STATUS=libhydra initialization failed");
- return SS_RC_INITIALIZATION_FAILED;
- }
atexit(libcharon_deinit);
if (!libcharon_init())
{