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

see #1049

Browse Source
This commit is contained in:
Vadim Kurland 2010-01-06 23:56:08 +00:00
parent 387c83cdd3
commit c8f06769e1
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_num
View File

@ -1 +1 @@
#define BUILD_NUM 2312
#define BUILD_NUM 2314

7
src/pflib/CompilerDriver_pf.cpp
View File

@ -113,7 +113,12 @@ string CompilerDriver_pf::getRemoteConfFileName(const string &ruleset_name,
if (remote_conf_name.empty() && remote_fw_name.empty())
return local_conf_name;
{
// local_conf_name may be a relative or absolute path. Return
// just the file name
QFileInfo fi(local_conf_name.c_str());
return fi.fileName().toStdString();
}
QFileInfo fi;

2
test/pf/objects-for-regression-tests.fwb
View File

@ -18141,7 +18141,7 @@
<Option name="use_tables">True</Option>
</FirewallOptions>
</Firewall>
<Firewall id="id47B07CD419082" host_OS="openbsd" inactive="False" lastCompiled="1255112555" lastInstalled="1255112564" lastModified="1255112550" platform="pf" version="4.x" name="openbsd-4.2" comment="firewall protects host it is running on&#10;&#10;Note that we set output file name to /tmp/labfw.fw to test what compiler is going to do (since it generates three files rather than one), as well as to test installer in this case&#10;" ro="False">
<Firewall id="id47B07CD419082" host_OS="openbsd" inactive="False" lastCompiled="1262822165" lastInstalled="1255112564" lastModified="1255112550" platform="pf" version="4.x" name="openbsd-4.2" comment="firewall protects host it is running on&#10;&#10;Note that we set output file name to /tmp/labfw.fw to test what compiler is going to do (since it generates three files rather than one), as well as to test installer in this case&#10;" ro="False">
<NAT id="id47B07D4319082" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
<RuleSetOptions/>
</NAT>