aboutsummaryrefslogtreecommitdiffstats
path: root/src/charon-cmd
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-cmd
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-cmd')
-rw-r--r--src/charon-cmd/Makefile.am2
-rw-r--r--src/charon-cmd/charon-cmd.c6
2 files changed, 0 insertions, 8 deletions
diff --git a/src/charon-cmd/Makefile.am b/src/charon-cmd/Makefile.am
index 73df45072..1f4033aad 100644
--- a/src/charon-cmd/Makefile.am
+++ b/src/charon-cmd/Makefile.am
@@ -12,7 +12,6 @@ charon-cmd.o : $(top_builddir)/config.status
AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \
- -I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon \
-DIPSEC_DIR=\"${ipsecdir}\" \
-DIPSEC_PIDDIR=\"${piddir}\" \
@@ -20,6 +19,5 @@ AM_CPPFLAGS = \
charon_cmd_LDADD = \
$(top_builddir)/src/libstrongswan/libstrongswan.la \
- $(top_builddir)/src/libhydra/libhydra.la \
$(top_builddir)/src/libcharon/libcharon.la \
-lm $(PTHREADLIB) $(DLLIB)
diff --git a/src/charon-cmd/charon-cmd.c b/src/charon-cmd/charon-cmd.c
index d3b31cc0d..f350198c6 100644
--- a/src/charon-cmd/charon-cmd.c
+++ b/src/charon-cmd/charon-cmd.c
@@ -26,7 +26,6 @@
#include <errno.h>
#include <library.h>
-#include <hydra.h>
#include <daemon.h>
#include <utils/backtrace.h>
#include <threading/thread.h>
@@ -330,11 +329,6 @@ int main(int argc, char *argv[])
exit(SS_RC_DAEMON_INTEGRITY);
}
}
- atexit(libhydra_deinit);
- if (!libhydra_init())
- {
- exit(SS_RC_INITIALIZATION_FAILED);
- }
atexit(libcharon_deinit);
if (!libcharon_init())
{