diff options
| author | Ermal <eri@pfsense.org> | 2011-05-18 23:09:48 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2011-05-18 23:09:48 +0000 |
| commit | 2f6532d55221f86cbc717350eafb8e4404181cbd (patch) | |
| tree | 740e98927ad65825471488f6edfe4048c996f033 /etc/rc.filter_synchronize | |
| parent | 941baf1e268f9e4483983a14c55de1b3cc20efea (diff) | |
| download | pfsense-2f6532d55221f86cbc717350eafb8e4404181cbd.zip pfsense-2f6532d55221f86cbc717350eafb8e4404181cbd.tar.gz | |
Fixes #1514. Differentiate in the carp settings between layer7, limiter and queues so layer7 and limiters do not rely on queues being active.
Diffstat (limited to 'etc/rc.filter_synchronize')
| -rwxr-xr-x | etc/rc.filter_synchronize | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/etc/rc.filter_synchronize b/etc/rc.filter_synchronize index 7039722..6acadc0 100755 --- a/etc/rc.filter_synchronize +++ b/etc/rc.filter_synchronize @@ -321,9 +321,10 @@ if (is_array($config['installedpackages']['carpsettings']['config'])) { if ($carp['synchronizetrafficshaper'] != "" and is_array($config['shaper'])) { $sections[] = 'shaper'; } - if ($carp['synchronizetrafficshaper'] != "") { - if (!is_array($config['l7shaper'])) - $config['l7shaper'] = array(); + if ($carp['synchronizetrafficshaperlimiter'] != "" and is_array($config['dnshaper'])) { + $sections[] = 'dnshaper'; + } + if ($carp['synchronizetrafficshaperlayer7'] != "" and is_array($config['l7shaper'])) { $sections[] = 'l7shaper'; } if ($carp['synchronizestaticroutes'] != "") { |
