Simplify ipset external checks and optionally initialize ispet name from external...

[project/firewall3.git] / rules.c

diff --git a/rules.c b/rules.c
index 785621f..7f748eb 100644 (file)
--- a/rules.c
+++ b/rules.c
@@ -368,8 +368,8 @@ expand_rule(struct fw3_state *state, enum fw3_family family,
                if (!fw3_check_ipset(rule->_ipset))
                {
                        info("     ! Skipping due to missing ipset '%s'",
                if (!fw3_check_ipset(rule->_ipset))
                {
                        info("     ! Skipping due to missing ipset '%s'",

-                            (rule->_ipset->external && *rule->_ipset->external) ?
-                                       rule->_ipset->external : rule->_ipset->name);
+                            rule->_ipset->external
+                                       ? rule->_ipset->external : rule->_ipset->name);

                        return;
                }
 
                        return;
                }