diff options
| author | jim-p <jimp@pfsense.org> | 2011-05-19 08:50:48 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2011-05-19 08:50:48 -0400 |
| commit | 27d0722d13f41c3a569d05588e08dd2b1c18fd43 (patch) | |
| tree | 3362f1f378d5d64de1446774fcb0b1b06b81c0b4 /etc/rc.filter_synchronize | |
| parent | 62a29fe39e7d579788e97ca05c6266f46fe1f957 (diff) | |
| parent | 2f6532d55221f86cbc717350eafb8e4404181cbd (diff) | |
| download | pfsense-27d0722d13f41c3a569d05588e08dd2b1c18fd43.zip pfsense-27d0722d13f41c3a569d05588e08dd2b1c18fd43.tar.gz | |
Merge remote branch 'upstream/master'
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 d588e8a..0fe4c15 100755 --- a/etc/rc.filter_synchronize +++ b/etc/rc.filter_synchronize @@ -323,9 +323,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'] != "") { |
