diff options
| author | Stig Thormodsrud <stig@vyatta.com> | 2008-01-14 12:17:37 -0800 |
|---|---|---|
| committer | Stig Thormodsrud <stig@vyatta.com> | 2008-01-14 12:17:37 -0800 |
| commit | 78124a9754efe0bda1d9c827c593c5e0635fec3c (patch) | |
| tree | ac2cd10d01b5aedd2e67ed420270072b5307ba60 | |
| parent | 74acf758d9059cf9832403da644c4f8eb088563e (diff) | |
| download | vyatta-cfg-quagga-78124a9754efe0bda1d9c827c593c5e0635fec3c.tar.gz vyatta-cfg-quagga-78124a9754efe0bda1d9c827c593c5e0635fec3c.zip | |
Fix bug 2643: perfix-list can be committed without any action being set
3 files changed, 2 insertions, 2 deletions
diff --git a/templates/policy/prefix-list/node.tag/rule/node.def b/templates/policy/prefix-list/node.tag/rule/node.def index e45083ca..f59d1ab4 100644 --- a/templates/policy/prefix-list/node.tag/rule/node.def +++ b/templates/policy/prefix-list/node.tag/rule/node.def @@ -2,6 +2,7 @@ tag: type: u32 help: "Specify prefix-list rule number" commit: $(./prefix/) != ""; "must set a prefix" +commit: $(./action/) != ""; "must specify an action before committing" delete: "touch /tmp/protocols-$(../@)-$(@).\\$PPID \ LEN=`echo $(@) | awk -F/ '{ print \\$2 }'` ; \ if [ -n \"$(./ge/@)\" ]; then \ diff --git a/templates/policy/prefix-list/node.tag/rule/node.tag/action/node.def b/templates/policy/prefix-list/node.tag/rule/node.tag/action/node.def index 9948b01e..eeb8f9e5 100644 --- a/templates/policy/prefix-list/node.tag/rule/node.tag/action/node.def +++ b/templates/policy/prefix-list/node.tag/rule/node.tag/action/node.def @@ -1,4 +1,3 @@ type: txt -default: "deny" help: "Action to take on prefixes matching this rule" syntax: $(@) in "permit", "deny"; "action must be permit or deny" diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/comm-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/comm-list/node.def index a6169894..1eadf4c2 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/comm-list/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/comm-list/node.def @@ -4,7 +4,7 @@ end: "if [ -z \"$(./comm-list/)\" ]; then \ echo You must configure a comm-list ; \ exit 1 ; \ fi ; \ - \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + \\${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"no set comm-list \" ; \ if [ -f \"/tmp/policy-route-map-$(../../../@)-$(../../action/@)-$(../../@)-set-comm-list.\\$PPID\" ]; then \ |