summaryrefslogtreecommitdiffstats
path: root/etc/inc/shaper.inc
diff options
context:
space:
mode:
authorRenato Botelho <renato.botelho@bluepex.com>2010-04-27 08:41:15 -0300
committerRenato Botelho <renato.botelho@bluepex.com>2010-04-27 08:41:15 -0300
commitbe28a8c001ea693d491a98190445fdf6890d49f8 (patch)
tree646672ebaf8cf7426e05cc973d7a34409181a1c5 /etc/inc/shaper.inc
parentfac4562ee206e6e442b2107fc153e4eae6a4b3a2 (diff)
parent0648c9688a4f3324c6e90039b5179eb64bde4653 (diff)
downloadpfsense-be28a8c001ea693d491a98190445fdf6890d49f8.zip
pfsense-be28a8c001ea693d491a98190445fdf6890d49f8.tar.gz
Merge remote branch 'mainline/master'
Diffstat (limited to 'etc/inc/shaper.inc')
-rw-r--r--etc/inc/shaper.inc3
1 files changed, 1 insertions, 2 deletions
diff --git a/etc/inc/shaper.inc b/etc/inc/shaper.inc
index d366180..9a023eb 100644
--- a/etc/inc/shaper.inc
+++ b/etc/inc/shaper.inc
@@ -3443,8 +3443,7 @@ class layer7 {
}
function delete_l7c() {
- $l7pid = `"/bin/pgrep -f 'ipfw-classifyd .* -p ". $l7rules->GetRPort() . "'"`;
- mwexec("/bin/kill {$l7pid}");
+ mwexec("/bin/pkill -f 'ipfw-classifyd .* -p ". $l7rules->GetRPort() . "'", true);
unset_l7_object_by_reference($this->GetRName());
cleanup_l7_from_rules($this->GetRName());
}
OpenPOWER on IntegriCloud