onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-21 10:47:16 +01:00
Code Issues Releases Wiki Activity

* Took out checks (added for #2514) for empty path in an Address

Browse Source 
Table object.  It's valid to have an empty path for the situation
	where a user wants to use an ipset in place of the table.
This commit is contained in:
Theron Tock 2011-07-13 13:36:43 -07:00
parent 68f908b2ff
commit 31357dc4d7
3 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/ChangeLog
View File

@ -5,6 +5,10 @@
group expansion is done the same way in the UI and for the group expansion is done the same way in the UI and for the
compiler, also fixed #2502 (consolidate logic for DynamicGroup). compiler, also fixed #2502 (consolidate logic for DynamicGroup).
* Took out checks (added for #2514) for empty path in an Address
Table object. It's valid to have an empty path for the situation
where a user wants to use an ipset in place of the table.
2011-07-11 theron <theron@netcitadel.com> 2011-07-11 theron <theron@netcitadel.com>
* Implemented #2514, support for address table alternate paths. * Implemented #2514, support for address table alternate paths.
There's a "data directory" setting under user preferences. If the There's a "data directory" setting under user preferences. If the

8
src/iptlib/NATCompiler_ipt.cpp
View File

@ -2318,10 +2318,6 @@ bool NATCompiler_ipt::processMultiAddressObjectsInRE::processNext()
{ {
string path = string path =
atrt->getSourceNameAsPath(compiler->getCachedFwOpt()); atrt->getSourceNameAsPath(compiler->getCachedFwOpt());
if (path.empty()) {
compiler->abort(rule, "Empty path or data directory for address table: " + atrt->getName());
return true;
}
rule->setStr("address_table_file", path); rule->setStr("address_table_file", path);
osconf->registerMultiAddressObject(atrt); osconf->registerMultiAddressObject(atrt);
} }
@ -2361,10 +2357,6 @@ bool NATCompiler_ipt::processMultiAddressObjectsInRE::processNext()
nre->addRef( atrt ); nre->addRef( atrt );
string path = atrt->getSourceNameAsPath(compiler->getCachedFwOpt()); string path = atrt->getSourceNameAsPath(compiler->getCachedFwOpt());
if (path.empty()) {
compiler->abort(rule, "Empty path or data directory for address table: " + atrt->getName());
return true;
}
r->setStr("address_table_file", path); r->setStr("address_table_file", path);
osconf->registerMultiAddressObject(atrt); osconf->registerMultiAddressObject(atrt);

8
src/iptlib/PolicyCompiler_ipt.cpp
View File

@ -3896,10 +3896,6 @@ bool PolicyCompiler_ipt::processMultiAddressObjectsInRE::processNext()
{ {
string path = string path =
atrt->getSourceNameAsPath(compiler->getCachedFwOpt()); atrt->getSourceNameAsPath(compiler->getCachedFwOpt());
if (path.empty()) {
compiler->abort(rule, "Empty path or data directory for address table: " + atrt->getName());
return true;
}
rule->setStr("address_table_file", path); rule->setStr("address_table_file", path);
osconf->registerMultiAddressObject(atrt); osconf->registerMultiAddressObject(atrt);
} }
@ -3943,10 +3939,6 @@ bool PolicyCompiler_ipt::processMultiAddressObjectsInRE::processNext()
nre->addRef( atrt ); nre->addRef( atrt );
string path = atrt->getSourceNameAsPath(compiler->getCachedFwOpt()); string path = atrt->getSourceNameAsPath(compiler->getCachedFwOpt());
if (path.empty()) {
compiler->abort(rule, "Empty path or data directory for address table: " + atrt->getName());
return true;
}
r->setStr("address_table_file", path); r->setStr("address_table_file", path);
osconf->registerMultiAddressObject(atrt); osconf->registerMultiAddressObject(atrt);