diff options
| author | Robert Bays <robert@vyatta.com> | 2010-08-10 17:46:01 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-08-12 11:22:08 -0400 |
| commit | 14fc7196baed3862f588246ff80b262809c39e21 (patch) | |
| tree | ea70150988251aab39c7c014219554b58f09b3a9 | |
| parent | 41eee229bb7d7e681bd514a916654ebaddf7af13 (diff) | |
| download | vyatta-cfg-quagga-14fc7196baed3862f588246ff80b262809c39e21.tar.gz vyatta-cfg-quagga-14fc7196baed3862f588246ff80b262809c39e21.zip | |
fix for bug 4393
(cherry picked from commit 21858a3f00d9fcbdd4d6f627f28bb139c76ab82f)
4 files changed, 4 insertions, 1 deletions
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/export/node.def index 6e1360a5..d2c3a492 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/export/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/export/node.def @@ -8,3 +8,4 @@ allowed: local -a params echo -n ${params[@]##*/} commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" "; "access-list $VAR(@) doesn't exist" commit:expression: $VAR(../../prefix-list/export/) == ""; "you can't set both a prefix-list and a distribute list" +commit:expression: $VAR(../../peer-group/) == ""; "distribute-lists can't be set for members of a peer-group" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/import/node.def index 05c38e66..41faaf35 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/import/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/import/node.def @@ -8,3 +8,4 @@ allowed: local -a params echo -n ${params[@]##*/} commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" "; "access-list $VAR(@) doesn't exist" commit:expression: $VAR(../../prefix-list/import/) == ""; "you can't set both a prefix-list and a distribute list" +commit:expression: $VAR(../../peer-group/) == ""; "distribute-lists can't be set for members of a peer-group" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/export/node.def index 8e84af9d..cd084876 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/export/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/export/node.def @@ -4,4 +4,5 @@ allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy prefix-list ) echo -n ${params[@]##*/} commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" "; "prefix-list $VAR(@) doesn't exist" +commit:expression: $VAR(../../peer-group/) == ""; "prefix-lists can't be set for members of a peer-group" commit:expression: $VAR(../../distribute-list/export/) == ""; "you can't set both a prefix-list and a distribute list" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/import/node.def index baa56b2e..5fc93a3a 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/import/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/import/node.def @@ -4,5 +4,5 @@ allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy prefix-list ) echo -n ${params[@]##*/} commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" "; "prefix-list $VAR(@) doesn't exist" +commit:expression: $VAR(../../peer-group/) == ""; "prefix-lists can't be set for members of a peer-group" commit:expression: $VAR(../../distribute-list/import/) == ""; "you can't set both a prefix-list and a distribute list" - |