denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tobias Brunner
2013-07-22 18:00:19 +02:00
parent 62293ed271
commit 517823b466
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/starter/Makefile.am
+1
View File
@@ -15,6 +15,7 @@ AM_CPPFLAGS = \
-DIPSEC_CONFDIR=\"${sysconfdir}\" \ -DIPSEC_CONFDIR=\"${sysconfdir}\" \
-DIPSEC_PIDDIR=\"${piddir}\" \ -DIPSEC_PIDDIR=\"${piddir}\" \
-DIPSEC_EAPDIR=\"${eapdir}\" \ -DIPSEC_EAPDIR=\"${eapdir}\" \
-DIPSEC_SCRIPT=\"${ipsec_script}\" \
-DDEV_RANDOM=\"${random_device}\" \ -DDEV_RANDOM=\"${random_device}\" \
-DDEV_URANDOM=\"${urandom_device}\" \ -DDEV_URANDOM=\"${urandom_device}\" \
-DPLUGINS=\""${starter_plugins}\"" \ -DPLUGINS=\""${starter_plugins}\"" \
src/starter/confread.c
+1 -1
View File
@@ -38,7 +38,7 @@
static const char ike_defaults[] = "aes128-sha1-modp2048,3des-sha1-modp1536"; static const char ike_defaults[] = "aes128-sha1-modp2048,3des-sha1-modp1536";
static const char esp_defaults[] = "aes128-sha1,3des-sha1"; 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) static bool daemon_exists(char *daemon, char *path)
{ {
src/starter/starter.c
+1 -1
View File
@@ -295,7 +295,7 @@ static void generate_selfcert()
#endif #endif
ignore_result(setegid(gid)); ignore_result(setegid(gid));
ignore_result(seteuid(uid)); 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(seteuid(0));
ignore_result(setegid(0)); ignore_result(setegid(0));