From 633c02c1ac86dcd10e52e87e68e5ca757990b6e8 Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Mon, 21 Jan 2013 09:48:40 -0200 Subject: Previous attempt to fix #1995 allow to set more than one default queues, prevent it with this change. It should fix #1995 --- etc/inc/shaper.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'etc') diff --git a/etc/inc/shaper.inc b/etc/inc/shaper.inc index cec5157..aa7831e 100644 --- a/etc/inc/shaper.inc +++ b/etc/inc/shaper.inc @@ -985,7 +985,8 @@ class priq_queue { $input_errors[] = "Queue names must be alphanumeric and _ or - only."; if (!empty($data['name']) && !preg_match("/^[a-zA-Z0-9_-]*$/", $data['name'])) $input_errors[] = "Queue names must be alphanumeric and _ or - only."; - if (!empty($data['default']) && altq_get_default_queue($data['interface']) && ($data['name'] != $this->GetQName())) + $default = $this->GetDefault(); + if (!empty($data['default']) && altq_get_default_queue($data['interface']) && empty($default)) $input_errors[] = "Only one default queue per interface is allowed."; } -- cgit v1.1