From 01ef2f28b9bed3547a57e3f9b65db56973b101d4 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@foo-projects.org>
Date: Sat, 8 Mar 2008 22:03:39 +0000
Subject: [PATCH] merged {has_action} setters

git-svn-id: svn+ssh://foo-projects.org/var/svn/ferm/trunk@1137 887c3e53-ddf1-0310-8e39-e0d3fab4ed34
---
 src/ferm | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/ferm b/src/ferm
index fbd16d1..672c5e5 100755
--- a/src/ferm
+++ b/src/ferm
@@ -1575,8 +1575,6 @@ sub set_module_target(\%$$) {
         }
     }
 
-    $rule->{has_action} = 1;
-
     merge_keywords(%$rule, 'target', $name, $defs->{keywords});
 }
 
@@ -2054,13 +2052,10 @@ sub enter($$) {
                 error('There can only one action per rule')
                   if exists $current{has_action};
                 my $chain = getvar();
-                if (is_netfilter_core_target($chain)) {
-                    $current{has_action} = 1;
-                } elsif (my $defs = is_netfilter_module_target($current{domain_family}, $chain)) {
+                if (my $defs = is_netfilter_module_target($current{domain_family}, $chain)) {
                     set_module_target(%current, $chain, $defs);
-                } else {
-                    $current{has_action} = 1;
                 }
+                $current{has_action} = 1;
                 append_option(%current, 'jump', $chain);
                 next;
             };
@@ -2096,6 +2091,7 @@ sub enter($$) {
                   if exists $current{has_action};
 
                 set_module_target(%current, $keyword, $defs);
+                $current{has_action} = 1;
                 append_option(%current, 'jump', $keyword);
                 next;
             }
-- 
2.11.4.GIT