1
0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-23 03:37:15 +01:00

Fixed SF bug #3106168 "Branch destinations lost when adding to

cluster".  Since the order in which I copy rule sets is
      undefined and because they may have references to each other via
      branching rules, I need to fix references after I create all
      of them.
This commit is contained in:
Vadim Kurland 2010-11-11 17:33:35 -08:00
parent 61d7b7c805
commit 749436ed6a
3 changed files with 26 additions and 1 deletions

View File

@ -1,5 +1,11 @@
2010-11-11 Vadim Kurland <vadim@vk.crocodile.org>
* newClusterDialog_create.cpp (copyRuleSets): Fixed SF bug
#3106168 "Branch destinations lost when adding to cluster". Since
the order in which I copy rule sets is undefined and because they
may have references to each other via branching rules, I need to
fix references after I create all of them.
* configlets/linux24/load_modules: fixed #1844 "generated script
fails if module nf_conntrack_ipv6 does not exist". Generated
script tries to load module nf_conntrack_ipv6 if user defined

View File

@ -298,8 +298,23 @@ void newClusterDialog::copyRuleSets(const string &type, Firewall *source,
for (; it != it.end(); ++it)
{
FWObject *new_ruleset = ncl->addCopyOf(*it);
id_mapping[(*it)->getId()] = new_ruleset->getId();
db->fixReferences(new_ruleset, id_mapping);
}
/*
* since the order in which we copy rule sets is undefined and
* because they may have references to each other via branching
* rules, we need to fix references in them after we create all of
* them. This fixes SF bug #3106168 "Branch destinations lost when adding to cluster"
*/
it = ncl->findByType(type);
for (; it != it.end(); ++it)
{
db->fixReferences(*it, id_mapping);
}
}

View File

@ -52,7 +52,6 @@
</p>
</li>
<li>
<p>
see #1809 "Add Firewall Setting in Logging settings for default
@ -85,6 +84,11 @@
<li>
<p>
Fixed SF bug #3106168 "Branch destinations lost when adding to
cluster". Since the order in which I copy rule sets is
undefined and because they may have references to each other via
branching rules, I need to fix references after I create all
of them.
</p>
</li>