From b7ad33674367a8de6d87b78f4049390e90fcb11f Mon Sep 17 00:00:00 2001 From: Mika Havela Date: Mon, 27 Jul 2009 08:37:46 +0000 Subject: 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 --- main/ipsec-tools/racoon.confd | 1 + main/ipsec-tools/racoon.initd | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/main/ipsec-tools/racoon.confd b/main/ipsec-tools/racoon.confd index 66f8ed76..bf9926c5 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 16fdec7e..0ed4efe5 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 -- cgit v1.2.3