libimcv: Fix harcoded IMCV_DEFAULT_POLICY_SCRIPT name

I came across an issue with src/libimcv/imcv.c where
IMCV_DEFAULT_POLICY_SCRIPT is hardcoded.

It fails where ipsec_script is renamed to, for example, strongswan from
default ipsec.

diff --git a/src/libimcv/Makefile.am b/src/libimcv/Makefile.am
index 2640f4c5c43b65db5fe83021e00d898aff0e0761..109421305d6504f1776976578d9c4d787b02e150 100644 (file)
--- a/src/libimcv/Makefile.am
+++ b/src/libimcv/Makefile.am
@@ -1,7 +1,8 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
        -I$(top_srcdir)/src/libtncif \
-       -I$(top_srcdir)/src/libpts
+       -I$(top_srcdir)/src/libpts \
+       -DIPSEC_SCRIPT=\"${ipsec_script}\"
 
 ipseclib_LTLIBRARIES = libimcv.la
 

diff --git a/src/libimcv/imcv.c b/src/libimcv/imcv.c
index 703da23066868038082d7e081f50d6636624d8d5..619fc8dbae207c0caaeccc36e68894e8ca553a5c 100644 (file)
--- a/src/libimcv/imcv.c
+++ b/src/libimcv/imcv.c
@@ -33,7 +33,7 @@
 #endif
 
 #define IMCV_DEBUG_LEVEL                       1
-#define IMCV_DEFAULT_POLICY_SCRIPT     "ipsec _imv_policy"
+#define IMCV_DEFAULT_POLICY_SCRIPT     IPSEC_SCRIPT " _imv_policy"
 
 
 /**