From 6ffbc6e0d5e722137ea25249d066e5ca3c0a9991 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@foo-projects.org>
Date: Sun, 16 Dec 2007 01:57:47 +0000
Subject: [PATCH] merge 2 lines

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

diff --git a/src/ferm b/src/ferm
index abfc36c..6f130a5 100755
--- a/src/ferm
+++ b/src/ferm
@@ -1586,9 +1586,8 @@ sub parse_protocol_options($$$$) {
     return unless defined $proto_defs;
 
     my $proto_def = $proto_defs->{$proto};
-    return unless defined $proto_def;
-
-    return unless exists $proto_def->{keywords}{$keyword};
+    return unless defined $proto_def and
+      exists $proto_def->{keywords}{$keyword};
 
     my $module_name = $proto eq 'icmpv6' ? 'icmp6' : $proto;
     my $module = { name => $module_name,
-- 
2.11.4.GIT