From c8719a073da698a683220fc6efab3985f2fd3d60 Mon Sep 17 00:00:00 2001 From: Avesh Agarwal Date: Mon, 13 Oct 2014 16:15:33 +0200 Subject: [PATCH] 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. --- src/libimcv/Makefile.am | 3 ++- src/libimcv/imcv.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libimcv/Makefile.am b/src/libimcv/Makefile.am index 2640f4c5c..109421305 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 703da2306..619fc8dba 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" /**