mirror of
https://github.com/fwbuilder/fwbuilder
synced 2026-03-20 02:07:23 +01:00
see #2049 Installer reports success even if there was an error while creating static routes; new build 3462
This commit is contained in:
parent
9ddfbe7f96
commit
e2f05c1e0a
2
VERSION
2
VERSION
@ -7,7 +7,7 @@ FWB_MICRO_VERSION=0
|
||||
# build number is like "nano" version number. I am incrementing build
|
||||
# number during development cycle
|
||||
#
|
||||
BUILD_NUM="3461"
|
||||
BUILD_NUM="3462"
|
||||
|
||||
VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM"
|
||||
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
#define VERSION "4.2.0.3461"
|
||||
#define VERSION "4.2.0.3462"
|
||||
#define GENERATION "4.2"
|
||||
|
||||
@ -1,5 +1,10 @@
|
||||
2011-02-06 vadim <vadim@netcitadel.com>
|
||||
|
||||
* SSHUnx.cpp (SSHUnx): fixes #2049 "Installer reports success even
|
||||
if there was an error while creating static routes". Added our own
|
||||
error message generated when command used to add static route
|
||||
fails to the list of error messages recognized by the installer.
|
||||
|
||||
* OSConfigurator_freebsd.cpp (updateBridgeOfInterface): see #1889, #2043
|
||||
Added support for bridge interface configuration in BSD.
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
|
||||
%define name fwbuilder
|
||||
%define version 4.2.0.3461
|
||||
%define version 4.2.0.3462
|
||||
%define release 1
|
||||
|
||||
%if "%_vendor" == "MandrakeSoft"
|
||||
|
||||
@ -4,6 +4,6 @@ Replaces: fwbuilder (<=4.1.1-1), fwbuilder-common, fwbuilder-bsd, fwbuilder-linu
|
||||
Priority: extra
|
||||
Section: checkinstall
|
||||
Maintainer: vadim@fwbuilder.org
|
||||
Version: 4.2.0.3461-1
|
||||
Version: 4.2.0.3462-1
|
||||
Depends: libqt4-gui (>= 4.3.0), libxml2, libxslt1.1, libsnmp | libsnmp15
|
||||
Description: Firewall Builder GUI and policy compilers
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
|
||||
%define name fwbuilder
|
||||
%define version 4.2.0.3461
|
||||
%define version 4.2.0.3462
|
||||
%define release 1
|
||||
|
||||
%if "%_vendor" == "MandrakeSoft"
|
||||
|
||||
@ -83,6 +83,7 @@ SSHUnx::SSHUnx(QWidget *_par,
|
||||
pfctl_errors << "error setting skip interface(s)";
|
||||
pfctl_errors << "errors in altq config";
|
||||
|
||||
route_add_errors << "Error: Routing rule .* couldn't be activated";
|
||||
}
|
||||
|
||||
SSHUnx::~SSHUnx()
|
||||
@ -130,6 +131,7 @@ bool SSHUnx::checkForErrors()
|
||||
|
||||
if (checkForErrors(&iptables_errors)) return true;
|
||||
if (checkForErrors(&pfctl_errors)) return true;
|
||||
if (checkForErrors(&route_add_errors)) return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -42,6 +42,7 @@ class SSHUnx : public SSHSession {
|
||||
|
||||
QStringList iptables_errors;
|
||||
QStringList pfctl_errors;
|
||||
QStringList route_add_errors;
|
||||
|
||||
|
||||
public:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user