aboutsummaryrefslogtreecommitdiffstats
path: root/src/libcharon/plugins/resolve
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/libcharon/plugins/resolve
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/libcharon/plugins/resolve')
-rw-r--r--src/libcharon/plugins/resolve/Makefile.am1
-rw-r--r--src/libcharon/plugins/resolve/resolve_handler.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/src/libcharon/plugins/resolve/Makefile.am b/src/libcharon/plugins/resolve/Makefile.am
index 9cfc370c0..d3d4e73cf 100644
--- a/src/libcharon/plugins/resolve/Makefile.am
+++ b/src/libcharon/plugins/resolve/Makefile.am
@@ -1,6 +1,5 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \
- -I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon \
-DRESOLV_CONF=\"${resolv_conf}\"
diff --git a/src/libcharon/plugins/resolve/resolve_handler.c b/src/libcharon/plugins/resolve/resolve_handler.c
index 74c3960ff..ec3decc4d 100644
--- a/src/libcharon/plugins/resolve/resolve_handler.c
+++ b/src/libcharon/plugins/resolve/resolve_handler.c
@@ -20,7 +20,6 @@
#include <sys/stat.h>
#include <unistd.h>
-#include <hydra.h>
#include <utils/debug.h>
#include <threading/mutex.h>