strongswan: force killing charon at ipsec stop if it not react to term.
[people/pmueller/ipfire-2.x.git] / src / patches / strongswan-4.5.2-force_kill_charon.patch
1 diff -Naur strongswan-4.5.2.org/src/ipsec/ipsec.in strongswan-4.5.2/src/ipsec/ipsec.in
2 --- strongswan-4.5.2.org/src/ipsec/ipsec.in     2010-12-18 17:19:05.000000000 +0100
3 +++ strongswan-4.5.2/src/ipsec/ipsec.in 2011-07-03 11:39:39.501501334 +0200
4 @@ -326,7 +326,7 @@
5                 if [ -n "$spid" ]
6                 then
7                         kill $spid 2>/dev/null
8 -                       loop=5
9 +                       loop=30
10                         while [ $loop -gt 0 ] ; do
11                                 kill -0 $spid 2>/dev/null || break
12                                 sleep 1
13 @@ -335,6 +335,7 @@
14                         if [ $loop -eq 0 ]
15                         then
16                                 kill -KILL $spid 2>/dev/null
17 +                               killall -KILL charon 2>/dev/null
18                                 rm -f $IPSEC_STARTER_PID
19                         fi
20                 fi