diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-10-28 19:44:33 +0100 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-10-28 19:44:33 +0100 |
| commit | ad8e08d5d5243105a1bdaafef688753763285a06 (patch) | |
| tree | 8defaafb646ebee51f2df0d20851961651d614d8 | |
| parent | 492f7d07813f0ac807c94b3880990fa4f86cd5d6 (diff) | |
| parent | d4799d1715fc3177b84d66af406fa3028a95d254 (diff) | |
| download | vyatta-cfg-firewall-ad8e08d5d5243105a1bdaafef688753763285a06.tar.gz vyatta-cfg-firewall-ad8e08d5d5243105a1bdaafef688753763285a06.zip | |
Merge branch 'current' into crux
Conflicts:
debian/changelog
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | templates/firewall/ipv6-name/node.tag/rule/node.tag/action/node.def | 7 | ||||
| -rw-r--r-- | templates/firewall/name/node.tag/rule/node.tag/action/node.def | 7 |
3 files changed, 9 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog index 9f5af22..24f0ff3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -vyatta-cfg-firewall (1.2.0-1) stable; urgency=medium +vyatta-cfg-firewall (0.14.0+vyos2+current2) unstable; urgency=medium - * New branch. + * T59: Inspect action still exists in firewall and should be removed - -- Daniil Baturin <daniil@baturin.org> Fri, 28 Sep 2018 21:32:05 +0200 + -- hagbard <vyos.dev@derith.de> Fri, 26 Oct 2018 11:54:38 -0700 vyatta-cfg-firewall (0.14.0+vyos2+current1) unstable; urgency=medium diff --git a/templates/firewall/ipv6-name/node.tag/rule/node.tag/action/node.def b/templates/firewall/ipv6-name/node.tag/rule/node.tag/action/node.def index d4a0bd3..b97e320 100644 --- a/templates/firewall/ipv6-name/node.tag/rule/node.tag/action/node.def +++ b/templates/firewall/ipv6-name/node.tag/rule/node.tag/action/node.def @@ -2,12 +2,11 @@ type: txt help: Rule action -syntax:expression: $VAR(@) in "drop", "reject", "accept", "inspect"; - "action must be one of drop, reject, accept, or inspect" +syntax:expression: $VAR(@) in "drop", "reject", "accept"; + "action must be one of drop, reject or accept" -allowed: echo "drop reject accept inspect" +allowed: echo "drop reject accept" val_help: drop; Rule action to drop val_help: reject; Rule action to reject val_help: accept; Rule action to accept -val_help: inspect; Rule action to inspect diff --git a/templates/firewall/name/node.tag/rule/node.tag/action/node.def b/templates/firewall/name/node.tag/rule/node.tag/action/node.def index 971b1a4..ada34de 100644 --- a/templates/firewall/name/node.tag/rule/node.tag/action/node.def +++ b/templates/firewall/name/node.tag/rule/node.tag/action/node.def @@ -2,12 +2,11 @@ type: txt help: Rule action [REQUIRED] -syntax:expression: $VAR(@) in "drop", "reject", "accept", "inspect"; - "action must be one of drop, reject, accept, or inspect" +syntax:expression: $VAR(@) in "drop", "reject", "accept"; + "action must be one of drop, reject or accept" -allowed: echo "drop reject accept inspect" +allowed: echo "drop reject accept" val_help: drop ; Rule action to drop val_help: reject ; Rule action to reject val_help: accept ; Rule action to accept -val_help: inspect ; Rule action to inspect |