From: Tobias Brunner <tobias@strongswan.org>
Date: Mon, 22 Jul 2013 15:59:49 +0000 (+0200)
Subject: starter: Properly refer to the ipsec script if it was renamed
X-Git-Tag: 5.1.0~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=517823b4667947546a0ff0bdee0e8f9eb24e307d;p=thirdparty%2Fstrongswan.git

starter: Properly refer to the ipsec script if it was renamed
---

diff --git a/src/starter/Makefile.am b/src/starter/Makefile.am
index 0c2d250f4f..48110dd027 100644
--- a/src/starter/Makefile.am
+++ b/src/starter/Makefile.am
@@ -15,6 +15,7 @@ AM_CPPFLAGS = \
 	-DIPSEC_CONFDIR=\"${sysconfdir}\" \
 	-DIPSEC_PIDDIR=\"${piddir}\" \
 	-DIPSEC_EAPDIR=\"${eapdir}\" \
+	-DIPSEC_SCRIPT=\"${ipsec_script}\" \
 	-DDEV_RANDOM=\"${random_device}\" \
 	-DDEV_URANDOM=\"${urandom_device}\" \
 	-DPLUGINS=\""${starter_plugins}\"" \
diff --git a/src/starter/confread.c b/src/starter/confread.c
index f0f05b0363..2fb022692f 100644
--- a/src/starter/confread.c
+++ b/src/starter/confread.c
@@ -38,7 +38,7 @@
 static const char ike_defaults[] = "aes128-sha1-modp2048,3des-sha1-modp1536";
 static const char esp_defaults[] = "aes128-sha1,3des-sha1";
 
-static const char firewall_defaults[] = "ipsec _updown iptables";
+static const char firewall_defaults[] = IPSEC_SCRIPT " _updown iptables";
 
 static bool daemon_exists(char *daemon, char *path)
 {
diff --git a/src/starter/starter.c b/src/starter/starter.c
index 9620fb63a6..06eb142bd4 100644
--- a/src/starter/starter.c
+++ b/src/starter/starter.c
@@ -295,7 +295,7 @@ static void generate_selfcert()
 #endif
 		ignore_result(setegid(gid));
 		ignore_result(seteuid(uid));
-		ignore_result(system("ipsec scepclient --out pkcs1 --out cert-self --quiet"));
+		ignore_result(system(IPSEC_SCRIPT " scepclient --out pkcs1 --out cert-self --quiet"));
 		ignore_result(seteuid(0));
 		ignore_result(setegid(0));