diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2013-07-22 17:59:49 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2013-07-22 18:00:19 +0200 |
| commit | 517823b4667947546a0ff0bdee0e8f9eb24e307d (patch) | |
| tree | b76dd894fc156fb0163c3677ca2f7654232bff8d /src | |
| parent | 62293ed27116e816fb38451c2d0ecf7f6b39e508 (diff) | |
| download | strongswan-517823b4667947546a0ff0bdee0e8f9eb24e307d.tar.bz2 strongswan-517823b4667947546a0ff0bdee0e8f9eb24e307d.tar.xz | |
starter: Properly refer to the ipsec script if it was renamed
Diffstat (limited to 'src')
| -rw-r--r-- | src/starter/Makefile.am | 1 | ||||
| -rw-r--r-- | src/starter/confread.c | 2 | ||||
| -rw-r--r-- | src/starter/starter.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/starter/Makefile.am b/src/starter/Makefile.am index 0c2d250f4..48110dd02 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 f0f05b036..2fb022692 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 9620fb63a..06eb142bd 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)); |