From e02d7e71840cad21edcaa0f0bca0484624ed6160 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@foo-projects.org>
Date: Sat, 8 Mar 2008 23:50:23 +0000
Subject: [PATCH] eliminated get_builtin_keywords()

git-svn-id: svn+ssh://foo-projects.org/var/svn/ferm/trunk@1150 887c3e53-ddf1-0310-8e39-e0d3fab4ed34
---
 src/ferm | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/src/ferm b/src/ferm
index c11659e..904606d 100755
--- a/src/ferm
+++ b/src/ferm
@@ -362,23 +362,6 @@ add_target_def_x 'eb', 'snat', qw(to-source snat-target);
 # import-ferm uses the above tables
 return 1 if $0 =~ /import-ferm$/;
 
-use vars qw(%builtin_keywords);
-
-sub get_builtin_keywords($) {
-    my $domain_family = shift;
-    return {} unless defined $domain_family;
-
-    return {%{$builtin_keywords{$domain_family}}}
-      if exists $builtin_keywords{$domain_family};
-
-    return {} unless exists $match_defs{$domain_family};
-    my $defs_kw = $match_defs{$domain_family}{''}{keywords};
-    my %keywords = %$defs_kw;
-
-    $builtin_keywords{$domain_family} = \%keywords;
-    return {%keywords};
-}
-
 # parameter parser for ipt_multiport
 sub multiport_params {
     my $fw = shift;
@@ -1527,7 +1510,7 @@ sub set_domain(\%$) {
     }
 
     $rule->{domain_family} = $domain_family;
-    $rule->{keywords} = get_builtin_keywords($domain_family);
+    $rule->{keywords} = {%{$match_defs{$domain_family}{''}{keywords}}};
     delete $rule->{cow}{keywords};
 
     $rule->{domain} = $stack[0]{auto}{DOMAIN} = $filtered_domain;
-- 
2.11.4.GIT