diff options
| author | Bill Nottingham <notting@redhat.com> | 2010-06-04 16:26:04 -0400 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2010-06-04 16:26:04 -0400 |
| commit | c305870fe4043a8aad7d8456a643422b7fe61593 (patch) | |
| tree | c16313c5fb4b497c5014eb1ec0b0cb02fcbc9a0a | |
| parent | 300aaee62cd7a3166969e795b53b065c510e09c1 (diff) | |
| download | initscripts-c305870fe4043a8aad7d8456a643422b7fe61593.tar initscripts-c305870fe4043a8aad7d8456a643422b7fe61593.tar.gz initscripts-c305870fe4043a8aad7d8456a643422b7fe61593.tar.bz2 initscripts-c305870fe4043a8aad7d8456a643422b7fe61593.tar.xz initscripts-c305870fe4043a8aad7d8456a643422b7fe61593.zip | |
Don't use a full path when killing racoon, so it works in MLS policy (#567295)
| -rwxr-xr-x | sysconfig/network-scripts/ifdown-ipsec | 2 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifup-ipsec | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sysconfig/network-scripts/ifdown-ipsec b/sysconfig/network-scripts/ifdown-ipsec index 3167fa63..85133784 100755 --- a/sysconfig/network-scripts/ifdown-ipsec +++ b/sysconfig/network-scripts/ifdown-ipsec @@ -80,7 +80,7 @@ if [ "$KEYING" = "automatic" -a -n "$IKE_METHOD" ]; then racoontmp=$(mktemp /etc/racoon/racoon.XXXXXX) grep -v "^include \"/etc/racoon/$DST.conf\";" /etc/racoon/racoon.conf >> $racoontmp mv -f $racoontmp /etc/racoon/racoon.conf - pidof -x /usr/sbin/racoon > /dev/null 2>&1 && killall -HUP /usr/sbin/racoon + pidof -x /usr/sbin/racoon > /dev/null 2>&1 && killall -HUP racoon fi /etc/sysconfig/network-scripts/ifdown-post $CONFIG diff --git a/sysconfig/network-scripts/ifup-ipsec b/sysconfig/network-scripts/ifup-ipsec index 2d40cc28..f3da7d4b 100755 --- a/sysconfig/network-scripts/ifup-ipsec +++ b/sysconfig/network-scripts/ifup-ipsec @@ -274,6 +274,6 @@ if [ "$KEYING" = "automatic" ]; then if ! pidof -x /usr/sbin/racoon > /dev/null 2>&1 ; then /usr/sbin/racoon elif [ -n "$IKE_METHOD" ]; then - killall -HUP /usr/sbin/racoon + killall -HUP racoon fi fi |