1
0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-18 17:27:20 +01:00

syncing with 2.1.18

This commit is contained in:
Vadim Kurland 2008-04-06 19:40:15 +00:00
parent 3dc8099fc3
commit 8163d15496
6 changed files with 30 additions and 22 deletions

View File

@ -1,3 +1,23 @@
2008-03-09 vadim <vadim@vk.crocodile.org>
* pf.cpp: fixed bug #1899914: "Script to apply the new rules." It
is enough to execute "pfctl -f file.conf" to load PF policy. There
is no need to purge filter and nat rules first, then reload it.
* RCS.cpp (RCSEnvFix::RCSEnvFix): fixed bug #1908351: "rcs does
not save log message and file remains locked"
* Compiler.cpp (emptyGroupsInRE::countChildren): (libfwbuilder)
fixed bug #1905718: "Group of DNS Name objects considered empty"
2008-03-05 vadim <vadim@vk.crocodile.org>
* VERSION: started v2.1.18
* src/cisco_lib, src/iosacl, src/pix: Code for policy compilers
for Cisco IOS ACL and PIX has been released under
GPL and merged into the main fwbuilder tree.
2008-02-18 vadim <vadim@vk.crocodile.org> 2008-02-18 vadim <vadim@vk.crocodile.org>
* CircularQueue.hpp (antlr): fixed crash of the policy importer on * CircularQueue.hpp (antlr): fixed crash of the policy importer on

View File

@ -2,12 +2,11 @@
<html> <html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii"> <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<link rel="stylesheet" type="text/css" href="http://www.fwbuilder.org/pages/fwbuilder.css">
</head> </head>
<body> <body>
<h1> Firewall Builder Release Notes </h1> <h1 class="relnotes_title"> Firewall Builder Release Notes </h1>
<br> <br>
<h2> Version 2.0.1 </h2> <h2 class="relnotes_version"> Version 2.0.1 </h2>
<br> <br>
<p> <p>
Released MM/DD/YY Released MM/DD/YY

View File

@ -6,7 +6,7 @@
Author: Vadim Kurland vadim@fwbuilder.org Author: Vadim Kurland vadim@fwbuilder.org
$Id: FWWindow.cpp,v 1.220 2007/07/07 05:39:33 vkurland Exp $ $Id: FWWindow.cpp,v 1.221 2008/03/10 03:42:20 vkurland Exp $
This program is free software which we release under the GNU General Public This program is free software which we release under the GNU General Public
License. You may redistribute and/or modify this program under the terms License. You may redistribute and/or modify this program under the terms

View File

@ -2244,8 +2244,9 @@ bool ProjectPanel::checkin(bool unlock)
if (systemFile || rcs==NULL || !rcs->isCheckedOut() || rcs->isTemp()) if (systemFile || rcs==NULL || !rcs->isCheckedOut() || rcs->isTemp())
return true; return true;
if (rcs->isDiff()) // if the file hasn't changed, do not need to ask for the comment if (rcs->isDiff())
{ {
// if the file hasn't changed, do not need to ask for the comment
if ( ! st->getRCSLogState()) if ( ! st->getRCSLogState())
{ {
RCSFileSaveDialog_q fsd; RCSFileSaveDialog_q fsd;

View File

@ -6,7 +6,7 @@
Author: Vadim Kurland vadim@fwbuilder.org Author: Vadim Kurland vadim@fwbuilder.org
$Id: RCS.cpp,v 1.63 2008/02/07 05:20:59 vkurland Exp $ $Id: RCS.cpp,v 1.64 2008/03/10 03:42:20 vkurland Exp $
This program is free software which we release under the GNU General Public This program is free software which we release under the GNU General Public
License. You may redistribute and/or modify this program under the terms License. You may redistribute and/or modify this program under the terms
@ -221,8 +221,10 @@ RCSEnvFix::RCSEnvFix()
env.push_back( QString("USER=")+uname); env.push_back( QString("USER=")+uname);
env.push_back( QString("LOGNAME=")+uname); env.push_back( QString("LOGNAME=")+uname);
env.push_back( QString("TMP=") + getenv("TMP")); if (getenv("TMP")!=NULL)
env.push_back( QString("TEMP=") + getenv("TEMP")); env.push_back( QString("TMP=") + getenv("TMP"));
if (getenv("TEMP")!=NULL)
env.push_back( QString("TEMP=") + getenv("TEMP"));
} }
QStringList* RCSEnvFix::getEnv() QStringList* RCSEnvFix::getEnv()

View File

@ -794,16 +794,6 @@ _("Dynamic interface %s should not have an IP address object attached to it. Thi
fw_file << endl; fw_file << endl;
fw_file << endl
<< "$PFCTL -d " << endl
<< "$PFCTL -F nat" << endl
<< "$PFCTL -F rules" << endl
<< "$PFCTL -F Sources" << endl
<< "$PFCTL -F Tables" << endl;
if (prolog_place == "fw_file") if (prolog_place == "fw_file")
printProlog(fw_file, pre_hook); printProlog(fw_file, pre_hook);
@ -823,10 +813,6 @@ _("Dynamic interface %s should not have an IP address object attached to it. Thi
<< " || exit 1" << " || exit 1"
<< endl; << endl;
fw_file << "$PFCTL -e"
<< " || exit 1"
<< endl;
fw_file << endl; fw_file << endl;
fw_file << "#" << endl; fw_file << "#" << endl;
fw_file << "# Epilog script" << endl; fw_file << "# Epilog script" << endl;