From: Avesh Agarwal <avesh.ncsu@gmail.com>
Date: Mon, 13 Oct 2014 14:15:33 +0000 (+0200)
Subject: libimcv: Fix harcoded IMCV_DEFAULT_POLICY_SCRIPT name
X-Git-Tag: 5.2.1~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8719a073da698a683220fc6efab3985f2fd3d60;p=thirdparty%2Fstrongswan.git

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 2640f4c5c4..109421305d 100644
--- 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 703da23066..619fc8dbae 100644
--- 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"
 
 
 /**