diff options
| author | Rene Mayrhofer <rene@mayrhofer.eu.org> | 2008-10-29 20:30:44 +0000 |
|---|---|---|
| committer | Rene Mayrhofer <rene@mayrhofer.eu.org> | 2008-10-29 20:30:44 +0000 |
| commit | 74f0bbfc53cb5fa519e4e27ece53735ab51b397c (patch) | |
| tree | 0dbab9c835be15577ff05b474b6361bb326d66ce /src/_updown/_updown.in | |
| parent | 5c1fa2516bda1ccf8eb00178c0beb196c2020a94 (diff) | |
| download | vyos-strongswan-74f0bbfc53cb5fa519e4e27ece53735ab51b397c.tar.gz vyos-strongswan-74f0bbfc53cb5fa519e4e27ece53735ab51b397c.zip | |
- New upstream release.
Diffstat (limited to 'src/_updown/_updown.in')
| -rw-r--r-- | src/_updown/_updown.in | 54 |
1 files changed, 29 insertions, 25 deletions
diff --git a/src/_updown/_updown.in b/src/_updown/_updown.in index cb0404b34..d71317e60 100644 --- a/src/_updown/_updown.in +++ b/src/_updown/_updown.in @@ -16,7 +16,7 @@ # or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License # for more details. # -# RCSID $Id: _updown.in 3389 2007-12-12 22:12:10Z andreas $ +# RCSID $Id: _updown.in 4187 2008-07-18 10:04:40Z andreas $ # CAUTION: Installing a new version of strongSwan will install a new # copy of this script, wiping out any custom changes you make. If @@ -302,6 +302,10 @@ then D_PEER_PORT="--dport $PLUTO_PEER_PORT" fi +# resolve octal escape sequences +PLUTO_MY_ID=`printf "$PLUTO_MY_ID"` +PLUTO_PEER_ID=`printf "$PLUTO_PEER_ID"` + # the big choice case "$PLUTO_VERB:$1" in prepare-host:*|prepare-client:*) @@ -385,13 +389,13 @@ up-host:iptables) # log IPsec host connection setup if [ $VPN_LOGGING ] then - if [ "$PLUTO_PEER_CLIENT" == "$PLUTO_PEER/32" ] + if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ] then logger -t $TAG -p $FAC_PRIO \ - "+ `echo -e $PLUTO_PEER_ID` $PLUTO_PEER -- $PLUTO_ME" + "+ $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME" else 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 ;; @@ -409,13 +413,13 @@ down-host:iptables) # log IPsec host connection teardown if [ $VPN_LOGGING ] then - if [ "$PLUTO_PEER_CLIENT" == "$PLUTO_PEER/32" ] + if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ] then logger -t $TAG -p $FAC_PRIO -- \ - "- `echo -e $PLUTO_PEER_ID` $PLUTO_PEER -- $PLUTO_ME" + "- $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME" else 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 ;; @@ -448,13 +452,13 @@ up-client:iptables) # log IPsec client connection setup if [ $VPN_LOGGING ] then - if [ "$PLUTO_PEER_CLIENT" == "$PLUTO_PEER/32" ] + if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ] then 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 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 ;; @@ -491,13 +495,13 @@ down-client:iptables) # log IPsec client connection teardown if [ $VPN_LOGGING ] then - if [ "$PLUTO_PEER_CLIENT" == "$PLUTO_PEER/32" ] + if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ] then 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 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 ;; @@ -544,13 +548,13 @@ up-host-v6:iptables) # log IPsec host connection setup if [ $VPN_LOGGING ] then - if [ "$PLUTO_PEER_CLIENT" == "$PLUTO_PEER/128" ] + if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/128" ] then logger -t $TAG -p $FAC_PRIO \ - "+ `echo -e $PLUTO_PEER_ID` $PLUTO_PEER -- $PLUTO_ME" + "+ $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME" else 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 ;; @@ -568,13 +572,13 @@ down-host-v6:iptables) # log IPsec host connection teardown if [ $VPN_LOGGING ] then - if [ "$PLUTO_PEER_CLIENT" == "$PLUTO_PEER/128" ] + if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/128" ] then logger -t $TAG -p $FAC_PRIO -- \ - "- `echo -e $PLUTO_PEER_ID` $PLUTO_PEER -- $PLUTO_ME" + "- $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME" else 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 ;; @@ -607,13 +611,13 @@ up-client-v6:iptables) # log IPsec client connection setup if [ $VPN_LOGGING ] then - if [ "$PLUTO_PEER_CLIENT" == "$PLUTO_PEER/128" ] + if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/128" ] then 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 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 ;; @@ -650,13 +654,13 @@ down-client-v6:iptables) # log IPsec client connection teardown if [ $VPN_LOGGING ] then - if [ "$PLUTO_PEER_CLIENT" == "$PLUTO_PEER/128" ] + if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/128" ] then 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 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 ;; |