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

diff --git a/src/starter/Makefile.am b/src/starter/Makefile.am
index 0c2d250f4f4f021604ac072e004f0dc554328c50..48110dd027289d5662f623d977f5eb369c13b4ac 100644 (file)
--- 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 f0f05b036309caa761052227625dc54c011a27db..2fb022692f265be4933116a2e0bd269a1d1430b3 100644 (file)
--- 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 9620fb63a64525c717472a2d8495998fa4d7f4a1..06eb142bd4d94ce157f8e3aac8bfbb1ed7ec5548 100644 (file)
--- 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));