diff options
| author | Phil Davis <phil.davis@inf.org> | 2015-07-21 21:47:12 +0545 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-07-21 13:51:19 -0300 |
| commit | ebd900f94638208c295154b5a93222e903267f31 (patch) | |
| tree | 1353184fe88348e5238e496d3fa6d7d97e823c9a | |
| parent | 2abf33edb27662c4e355820450b4cfdc034cd399 (diff) | |
| download | pfsense-ebd900f94638208c295154b5a93222e903267f31.zip pfsense-ebd900f94638208c295154b5a93222e903267f31.tar.gz | |
Allocate dnpipe and dnqueue numbers even if no filter rules
It would be quite unusual to have no filter rules array, but if that is indeed the case then the first part of this code that sets dnpipe and dnqueue numbers should execute anyway.
| -rw-r--r-- | etc/inc/upgrade_config.inc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index e9bf074..c622830 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -2924,8 +2924,6 @@ function upgrade_085_to_086() { function upgrade_086_to_087() { global $config, $dummynet_pipe_list; - if (!is_array($config['filter']) || !is_array($config['filter']['rule'])) - return; if (!is_array($config['dnshaper']) || !is_array($config['dnshaper']['queue'])) return; @@ -2945,6 +2943,9 @@ function upgrade_086_to_087() { unset($dnqueue_number, $dnpipe_number, $qidx, $idx, $dnpipe, $dnqueue); + if (!is_array($config['filter']) || !is_array($config['filter']['rule'])) + return; + require_once("shaper.inc"); read_dummynet_config(); |
