aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMika Havela <mika.havela@gmail.com>2009-07-27 08:37:46 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2009-08-05 14:27:06 +0000
commitb7ad33674367a8de6d87b78f4049390e90fcb11f (patch)
treeae4d048940131f9245cc80b975f14c58b4186b80
parent665a1bf85070cf159211ed46187d3633cf3a6b83 (diff)
downloadaports-b7ad33674367a8de6d87b78f4049390e90fcb11f.tar.bz2
aports-b7ad33674367a8de6d87b78f4049390e90fcb11f.tar.xz
Adding SETKEY_OPTS parameter to init.d and conf.d files This helps users to append e.g. '-k' option to the setkey command by modifying their /etc/conf.d/racoon file
-rw-r--r--main/ipsec-tools/racoon.confd1
-rw-r--r--main/ipsec-tools/racoon.initd2
2 files changed, 2 insertions, 1 deletions
diff --git a/main/ipsec-tools/racoon.confd b/main/ipsec-tools/racoon.confd
index 66f8ed7674..bf9926c5b5 100644
--- a/main/ipsec-tools/racoon.confd
+++ b/main/ipsec-tools/racoon.confd
@@ -8,6 +8,7 @@
# for valid command-line options
RACOON_OPTS="-4"
+SETKEY_OPTS=""
RACOON_CONF="/etc/racoon/racoon.conf"
RACOON_PSK_FILE="/etc/racoon/psk.txt"
diff --git a/main/ipsec-tools/racoon.initd b/main/ipsec-tools/racoon.initd
index 16fdec7e3a..0ed4efe500 100644
--- a/main/ipsec-tools/racoon.initd
+++ b/main/ipsec-tools/racoon.initd
@@ -36,7 +36,7 @@ checkconfig() {
start() {
checkconfig || return 1
einfo "Loading ipsec policies from ${SETKEY_CONF}."
- /usr/sbin/setkey -f ${SETKEY_CONF}
+ /usr/sbin/setkey ${SETKEY_OPTS} -f ${SETKEY_CONF}
if [ $? -eq 1 ] ; then
eerror "Error while loading ipsec policies"
fi