starter: Properly refer to the ipsec script if it was renamed
This commit is contained in:
@@ -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}\"" \
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
@@ -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));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user