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

eliminated bashisms in _updown scripts

Browse Source
This commit is contained in:
Andreas Steffen
2008-07-18 10:04:40 +00:00
parent bd07b59079
commit bb7b613b83
2 changed files with 44 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/_updown/_updown.in
+28 -24
View File
@@ -302,6 +302,10 @@ then
D_PEER_PORT="--dport $PLUTO_PEER_PORT" D_PEER_PORT="--dport $PLUTO_PEER_PORT"
fi fi
# resolve octal escape sequences
PLUTO_MY_ID=`printf "$PLUTO_MY_ID"`
PLUTO_PEER_ID=`printf "$PLUTO_PEER_ID"`
# the big choice # the big choice
case "$PLUTO_VERB:$1" in case "$PLUTO_VERB:$1" in
prepare-host:*|prepare-client:*) prepare-host:*|prepare-client:*)
@@ -385,13 +389,13 @@ up-host:iptables)
# log IPsec host connection setup # log IPsec host connection setup
if [ $VPN_LOGGING ] if [ $VPN_LOGGING ]
then then
if [ "$PLUTO_PEER_CLIENT" == "$PLUTO_PEER/32" ] if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ]
then then
logger -t $TAG -p $FAC_PRIO \ logger -t $TAG -p $FAC_PRIO \
"+ `echo -e $PLUTO_PEER_ID` $PLUTO_PEER -- $PLUTO_ME" "+ $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME"
else else
logger -t $TAG -p $FAC_PRIO \ logger -t $TAG -p $FAC_PRIO \
"+ `echo -e $PLUTO_PEER_ID` $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME" "+ $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME"
fi fi
fi fi
;; ;;
@@ -409,13 +413,13 @@ down-host:iptables)
# log IPsec host connection teardown # log IPsec host connection teardown
if [ $VPN_LOGGING ] if [ $VPN_LOGGING ]
then then
if [ "$PLUTO_PEER_CLIENT" == "$PLUTO_PEER/32" ] if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ]
then then
logger -t $TAG -p $FAC_PRIO -- \ logger -t $TAG -p $FAC_PRIO -- \
"- `echo -e $PLUTO_PEER_ID` $PLUTO_PEER -- $PLUTO_ME" "- $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME"
else else
logger -t $TAG -p $FAC_PRIO -- \ logger -t $TAG -p $FAC_PRIO -- \
"- `echo -e $PLUTO_PEER_ID` $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME" "- $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME"
fi fi
fi fi
;; ;;
@@ -448,13 +452,13 @@ up-client:iptables)
# log IPsec client connection setup # log IPsec client connection setup
if [ $VPN_LOGGING ] if [ $VPN_LOGGING ]
then then
if [ "$PLUTO_PEER_CLIENT" == "$PLUTO_PEER/32" ] if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ]
then then
logger -t $TAG -p $FAC_PRIO \ logger -t $TAG -p $FAC_PRIO \
"+ `echo -e $PLUTO_PEER_ID` $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT" "+ $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT"
else else
logger -t $TAG -p $FAC_PRIO \ logger -t $TAG -p $FAC_PRIO \
"+ `echo -e $PLUTO_PEER_ID` $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT" "+ $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT"
fi fi
fi fi
;; ;;
@@ -491,13 +495,13 @@ down-client:iptables)
# log IPsec client connection teardown # log IPsec client connection teardown
if [ $VPN_LOGGING ] if [ $VPN_LOGGING ]
then then
if [ "$PLUTO_PEER_CLIENT" == "$PLUTO_PEER/32" ] if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ]
then then
logger -t $TAG -p $FAC_PRIO -- \ logger -t $TAG -p $FAC_PRIO -- \
"- `echo -e $PLUTO_PEER_ID` $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT" "- $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT"
else else
logger -t $TAG -p $FAC_PRIO -- \ logger -t $TAG -p $FAC_PRIO -- \
"- `echo -e $PLUTO_PEER_ID` $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT" "- $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT"
fi fi
fi fi
;; ;;
@@ -544,13 +548,13 @@ up-host-v6:iptables)
# log IPsec host connection setup # log IPsec host connection setup
if [ $VPN_LOGGING ] if [ $VPN_LOGGING ]
then then
if [ "$PLUTO_PEER_CLIENT" == "$PLUTO_PEER/128" ] if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/128" ]
then then
logger -t $TAG -p $FAC_PRIO \ logger -t $TAG -p $FAC_PRIO \
"+ `echo -e $PLUTO_PEER_ID` $PLUTO_PEER -- $PLUTO_ME" "+ $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME"
else else
logger -t $TAG -p $FAC_PRIO \ logger -t $TAG -p $FAC_PRIO \
"+ `echo -e $PLUTO_PEER_ID` $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME" "+ $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME"
fi fi
fi fi
;; ;;
@@ -568,13 +572,13 @@ down-host-v6:iptables)
# log IPsec host connection teardown # log IPsec host connection teardown
if [ $VPN_LOGGING ] if [ $VPN_LOGGING ]
then then
if [ "$PLUTO_PEER_CLIENT" == "$PLUTO_PEER/128" ] if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/128" ]
then then
logger -t $TAG -p $FAC_PRIO -- \ logger -t $TAG -p $FAC_PRIO -- \
"- `echo -e $PLUTO_PEER_ID` $PLUTO_PEER -- $PLUTO_ME" "- $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME"
else else
logger -t $TAG -p $FAC_PRIO -- \ logger -t $TAG -p $FAC_PRIO -- \
"- `echo -e $PLUTO_PEER_ID` $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME" "- $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME"
fi fi
fi fi
;; ;;
@@ -607,13 +611,13 @@ up-client-v6:iptables)
# log IPsec client connection setup # log IPsec client connection setup
if [ $VPN_LOGGING ] if [ $VPN_LOGGING ]
then then
if [ "$PLUTO_PEER_CLIENT" == "$PLUTO_PEER/128" ] if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/128" ]
then then
logger -t $TAG -p $FAC_PRIO \ logger -t $TAG -p $FAC_PRIO \
"+ `echo -e $PLUTO_PEER_ID` $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT" "+ $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT"
else else
logger -t $TAG -p $FAC_PRIO \ logger -t $TAG -p $FAC_PRIO \
"+ `echo -e $PLUTO_PEER_ID` $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT" "+ $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT"
fi fi
fi fi
;; ;;
@@ -650,13 +654,13 @@ down-client-v6:iptables)
# log IPsec client connection teardown # log IPsec client connection teardown
if [ $VPN_LOGGING ] if [ $VPN_LOGGING ]
then then
if [ "$PLUTO_PEER_CLIENT" == "$PLUTO_PEER/128" ] if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/128" ]
then then
logger -t $TAG -p $FAC_PRIO -- \ logger -t $TAG -p $FAC_PRIO -- \
"- `echo -e $PLUTO_PEER_ID` $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT" "- $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT"
else else
logger -t $TAG -p $FAC_PRIO -- \ logger -t $TAG -p $FAC_PRIO -- \
"- `echo -e $PLUTO_PEER_ID` $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT" "- $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT"
fi fi
fi fi
;; ;;
src/_updown_espmark/_updown_espmark
+16 -12
View File
@@ -277,6 +277,10 @@ then
D_PEER_PORT="--dport $PLUTO_PEER_PORT" D_PEER_PORT="--dport $PLUTO_PEER_PORT"
fi fi
# resolve octal escape sequences
PLUTO_MY_ID=`printf "$PLUTO_MY_ID"`
PLUTO_PEER_ID=`printf "$PLUTO_PEER_ID"`
# the big choice # the big choice
case "$PLUTO_VERB:$1" in case "$PLUTO_VERB:$1" in
prepare-host:*|prepare-client:*) prepare-host:*|prepare-client:*)
@@ -333,13 +337,13 @@ up-host:*)
-s $PLUTO_ME $S_MY_PORT \ -s $PLUTO_ME $S_MY_PORT \
-d $PLUTO_PEER_CLIENT_NET/$PLUTO_PEER_CLIENT_MASK $D_PEER_PORT -j ACCEPT -d $PLUTO_PEER_CLIENT_NET/$PLUTO_PEER_CLIENT_MASK $D_PEER_PORT -j ACCEPT
# #
if [ "$PLUTO_PEER_CLIENT" == "$PLUTO_PEER/32" ] if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ]
then then
logger -t $TAG -p $FAC_PRIO \ logger -t $TAG -p $FAC_PRIO \
"+ `echo -e $PLUTO_PEER_ID` $PLUTO_PEER -- $PLUTO_ME" "+ $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME"
else else
logger -t $TAG -p $FAC_PRIO \ logger -t $TAG -p $FAC_PRIO \
"+ `echo -e $PLUTO_PEER_ID` $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME" "+ $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME"
fi fi
;; ;;
down-host:*) down-host:*)
@@ -354,13 +358,13 @@ down-host:*)
-s $PLUTO_ME $S_MY_PORT \ -s $PLUTO_ME $S_MY_PORT \
-d $PLUTO_PEER_CLIENT_NET/$PLUTO_PEER_CLIENT_MASK $D_PEER_PORT -j ACCEPT -d $PLUTO_PEER_CLIENT_NET/$PLUTO_PEER_CLIENT_MASK $D_PEER_PORT -j ACCEPT
# #
if [ "$PLUTO_PEER_CLIENT" == "$PLUTO_PEER/32" ] if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ]
then then
logger -t $TAG -p $FAC_PRIO -- \ logger -t $TAG -p $FAC_PRIO -- \
"- `echo -e $PLUTO_PEER_ID` $PLUTO_PEER -- $PLUTO_ME" "- $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME"
else else
logger -t $TAG -p $FAC_PRIO -- \ logger -t $TAG -p $FAC_PRIO -- \
"- `echo -e $PLUTO_PEER_ID` $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME" "- $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME"
fi fi
;; ;;
up-client:) up-client:)
@@ -374,13 +378,13 @@ up-client:)
-d $PLUTO_MY_CLIENT_NET/$PLUTO_MY_CLIENT_MASK $D_MY_PORT \ -d $PLUTO_MY_CLIENT_NET/$PLUTO_MY_CLIENT_MASK $D_MY_PORT \
$CHECK_MARK -j ACCEPT $CHECK_MARK -j ACCEPT
# #
if [ "$PLUTO_PEER_CLIENT" == "$PLUTO_PEER/32" ] if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ]
then then
logger -t $TAG -p $FAC_PRIO \ logger -t $TAG -p $FAC_PRIO \
"+ `echo -e $PLUTO_PEER_ID` $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT" "+ $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT"
else else
logger -t $TAG -p $FAC_PRIO \ logger -t $TAG -p $FAC_PRIO \
"+ `echo -e $PLUTO_PEER_ID` $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT" "+ $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT"
fi fi
;; ;;
down-client:) down-client:)
@@ -394,13 +398,13 @@ down-client:)
-d $PLUTO_MY_CLIENT_NET/$PLUTO_MY_CLIENT_MASK $D_MY_PORT \ -d $PLUTO_MY_CLIENT_NET/$PLUTO_MY_CLIENT_MASK $D_MY_PORT \
$CHECK_MARK -j ACCEPT $CHECK_MARK -j ACCEPT
# #
if [ "$PLUTO_PEER_CLIENT" == "$PLUTO_PEER/32" ] if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ]
then then
logger -t $TAG -p $FAC_PRIO -- \ logger -t $TAG -p $FAC_PRIO -- \
"- `echo -e $PLUTO_PEER_ID` $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT" "- $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT"
else else
logger -t $TAG -p $FAC_PRIO -- \ logger -t $TAG -p $FAC_PRIO -- \
"- `echo -e $PLUTO_PEER_ID` $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT" "- $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT"
fi fi
;; ;;
up-client:ipfwadm) up-client:ipfwadm)