diff options
| author | Robert Bays <rbays@moresby.(none)> | 2007-11-09 19:11:29 -0800 |
|---|---|---|
| committer | Robert Bays <rbays@moresby.(none)> | 2007-11-09 19:11:29 -0800 |
| commit | a1b390197920264609b903062156a22782ffff8e (patch) | |
| tree | 7a5da5d31a9a0d1f529bda28a84f1bf4fee6807a /templates | |
| parent | 02e778de3dac1672bde54294472e8122a0668735 (diff) | |
| download | vyatta-cfg-quagga-a1b390197920264609b903062156a22782ffff8e.tar.gz vyatta-cfg-quagga-a1b390197920264609b903062156a22782ffff8e.zip | |
template update
Diffstat (limited to 'templates')
8 files changed, 8 insertions, 8 deletions
diff --git a/templates/policy/access-list/node.tag/rule/node.tag/destination/any/node.def b/templates/policy/access-list/node.tag/rule/node.tag/destination/any/node.def index 7b7d73b8..2a9500e8 100644 --- a/templates/policy/access-list/node.tag/rule/node.tag/destination/any/node.def +++ b/templates/policy/access-list/node.tag/rule/node.tag/destination/any/node.def @@ -5,4 +5,4 @@ To set destination filter parameters, the access-list rule number must be \n \ <2000-2699> IP extended access list (expanded range) \n" commit: $(../../action/) != ""; "You must specify an action before committing" # TODO - comparison not working -#commit: $(../host/) != "" || $(../network/) != ""; "You may only define one filter type. (host|network|any)" +commit: ($(../host/) == "") && ($(../network/) == ""); "You may only define one filter type. (host|network|any)" diff --git a/templates/policy/access-list/node.tag/rule/node.tag/destination/host/node.def b/templates/policy/access-list/node.tag/rule/node.tag/destination/host/node.def index 13c3ae78..ba796170 100644 --- a/templates/policy/access-list/node.tag/rule/node.tag/destination/host/node.def +++ b/templates/policy/access-list/node.tag/rule/node.tag/destination/host/node.def @@ -5,5 +5,5 @@ To set destination filter parameters, the access-list rule number must be \n \ <100-199> IP extended access list \n \ <2000-2699> IP extended access list (expanded range) \n" # TODO - comparison not working -#commit: $(../any/) != "" || $(../network/) != ""; "You may only define one filter type. (host|network|any)" +commit: ($(../any/) == "") && ($(../network/) == ""); "You may only define one filter type. (host|network|any)" commit: $(../../action/) != ""; "You must specify an action before committing" diff --git a/templates/policy/access-list/node.tag/rule/node.tag/destination/inverse-mask/node.def b/templates/policy/access-list/node.tag/rule/node.tag/destination/inverse-mask/node.def index e9d61cdb..1bcd8278 100644 --- a/templates/policy/access-list/node.tag/rule/node.tag/destination/inverse-mask/node.def +++ b/templates/policy/access-list/node.tag/rule/node.tag/destination/inverse-mask/node.def @@ -7,4 +7,4 @@ To set destination filter parameters, the access-list rule number must be \n \ commit: $(../network/) != ""; "You must specify a network before committing" commit: $(../../action/) != ""; "You must specify an action before committing" # TODO - comparison not working -#commit: $(../any/) != "" || $(../host/) != ""; "You may only define one filter type. (host|network|any)" +commit: ($(../any/) == "") && ($(../host/) == ""); "You may only define one filter type. (host|network|any)" diff --git a/templates/policy/access-list/node.tag/rule/node.tag/destination/network/node.def b/templates/policy/access-list/node.tag/rule/node.tag/destination/network/node.def index ca98a8f1..edf91253 100644 --- a/templates/policy/access-list/node.tag/rule/node.tag/destination/network/node.def +++ b/templates/policy/access-list/node.tag/rule/node.tag/destination/network/node.def @@ -7,4 +7,4 @@ To set destination filter parameters, the access-list rule number must be \n \ commit: $(../inverse-mask/) != ""; "You must specify an inverse-mask before committing" commit: $(../../action/) != ""; "You must specify an action before committing" # TODO - comaprison not working -#commit: $(../host/) != "" || $(../any/) != ""; "You may only define one filter type (host|network|any)" +commit: ($(../host/) == "") && ($(../any/) == ""); "You may only define one filter type (host|network|any)" diff --git a/templates/policy/access-list/node.tag/rule/node.tag/source/any/node.def b/templates/policy/access-list/node.tag/rule/node.tag/source/any/node.def index 3985197c..b9ec61a2 100644 --- a/templates/policy/access-list/node.tag/rule/node.tag/source/any/node.def +++ b/templates/policy/access-list/node.tag/rule/node.tag/source/any/node.def @@ -1,4 +1,4 @@ help: "Filter any IP address" # TODO - comparison not working -#commit: $(../host/) != "" || $(../network/) != ""; "You may only define one filter type. (host|network|any)" +commit: ($(../host/) == "") && ($(../network/) == ""); "You may only define one filter type. (host|network|any)" commit: $(../../action/) != ""; "You must specify an action before committing" diff --git a/templates/policy/access-list/node.tag/rule/node.tag/source/host/node.def b/templates/policy/access-list/node.tag/rule/node.tag/source/host/node.def index 9136ce01..b4b8d569 100644 --- a/templates/policy/access-list/node.tag/rule/node.tag/source/host/node.def +++ b/templates/policy/access-list/node.tag/rule/node.tag/source/host/node.def @@ -1,5 +1,5 @@ type: ipv4 help: "Filter a host IP address" # TODO - comparison not working -#commit: $(../any/) != "" || $(../network/) != ""; "You may only define one filter type. (host|network|any)" +commit: ($(../any/) == "") && ($(../network/) == ""); "You may only define one filter type. (host|network|any)" commit: $(../../action/) != ""; "You must specify an action before committing" diff --git a/templates/policy/access-list/node.tag/rule/node.tag/source/inverse-mask/node.def b/templates/policy/access-list/node.tag/rule/node.tag/source/inverse-mask/node.def index 929ccb3d..a4d80f72 100644 --- a/templates/policy/access-list/node.tag/rule/node.tag/source/inverse-mask/node.def +++ b/templates/policy/access-list/node.tag/rule/node.tag/source/inverse-mask/node.def @@ -1,6 +1,6 @@ type: ipv4 help: "Filter a network IP netmask" # TODO - comparison not working -#commit: $(../any/) != "" || $(../host/) != ""; "You may only define one filter type. (host|network|any)" +commit: ($(../any/) == "") && ($(../host/) == ""); "You may only define one filter type. (host|network|any)" commit: $(../network/) != ""; "You must specify a network before committing" commit: $(../../action/) != ""; "You must specify an action before committing" diff --git a/templates/policy/access-list/node.tag/rule/node.tag/source/network/node.def b/templates/policy/access-list/node.tag/rule/node.tag/source/network/node.def index 53e3375b..9d9098cc 100644 --- a/templates/policy/access-list/node.tag/rule/node.tag/source/network/node.def +++ b/templates/policy/access-list/node.tag/rule/node.tag/source/network/node.def @@ -1,6 +1,6 @@ type: ipv4 help: "Filter a network IP address" # TODO - commparison not working -#commit: $(../host/) != "" || $(../any/) != ""; "You may only define one filter type (host|network|any)" +commit: ($(../host/) == "") && ($(../any/) == ""); "You may only define one filter type (host|network|any)" commit: $(../inverse-mask/) != ""; "You must specify an inverse-mask before committing" commit: $(../../action/) != ""; "You must specify an action before committing" |