fw4: support sets with timeout capability but without default expiry

[project/firewall4.git] / root / usr / share / firewall4 / templates / ruleset.uc

diff --git a/root/usr/share/firewall4/templates/ruleset.uc b/root/usr/share/firewall4/templates/ruleset.uc
index a09cb1f3238a04efb05ecd30abd8803a085ba8ae..eaa1f0449520d14b41aeca0391f1a3f1912c1f72 100644 (file)
--- a/root/usr/share/firewall4/templates/ruleset.uc
+++ b/root/usr/share/firewall4/templates/ruleset.uc
@@ -53,13 +53,15 @@ table inet fw4 {
 {%   if (set.maxelem > 0): %}
                size {{ set.maxelem }}
 {%   endif %}
-{%   if (set.timeout >= 0): %}
+{%   if (set.timeout > 0): %}
                timeout {{ set.timeout }}s
 {%   endif %}
 {%   if (set.interval): %}
-               flags interval
                auto-merge
 {%   endif %}
+{%   if (set.flags): %}
+               flags {{ join(',', set.flags) }}
+{%   endif %}
 {%   fw4.print_setentries(set) %}
        }