projects
/
webmin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a02ca65
)
Try again to kill a pptp connection
author
Jamie Cameron
<jcameron@webmin.com>
Fri, 24 Jul 2009 18:16:04 +0000
(11:16 -0700)
committer
Jamie Cameron
<jcameron@webmin.com>
Fri, 24 Jul 2009 18:16:04 +0000
(11:16 -0700)
pptp-client/disc.cgi
patch
|
blob
|
history
diff --git
a/pptp-client/disc.cgi
b/pptp-client/disc.cgi
index
075997d
..
ee432f1
100755
(executable)
--- a/
pptp-client/disc.cgi
+++ b/
pptp-client/disc.cgi
@@
-9,8
+9,14
@@
require './pptp-client-lib.pl';
($conn) = grep { $_->[0] eq $in{'tunnel'} } @conns;
$conn || &error($text{'disc_egone'});
&kill_logged('HUP', $conn->[1]) || &error($text{'disc_ekill'});
-&webmin_log("disc", undef, $in{'tunnel'});
sleep(3);
+@conns = &list_connected();
+($conn) = grep { $_->[0] eq $in{'tunnel'} } @conns;
+if ($conn) {
+ # Not dead .. kill harder
+ &kill_logged('KILL', $conn->[1]);
+ }
+&webmin_log("disc", undef, $in{'tunnel'});
&redirect("");