onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-09-13 16:39:48 +02:00
Code Issues Releases Wiki Activity

fixes #2269 using non-versioned path in the settings .ini file for the GUID

Browse Source
This commit is contained in:
Vadim Kurland
2011-03-23 17:45:11 -07:00
parent ee35e66818
commit 97061f54f0
6 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -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="3507"
BUILD_NUM="3508"
VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM"
VERSION.h
+1 -1
View File
@@ -1,2 +1,2 @@
#define VERSION "4.2.0.3507"
#define VERSION "4.2.0.3508"
#define GENERATION "4.2"
packaging/fwbuilder-static-qt.spec
+1 -1
View File
@@ -3,7 +3,7 @@
%define name fwbuilder
%define version 4.2.0.3507
%define version 4.2.0.3508
%define release 1
%if "%_vendor" == "MandrakeSoft"
packaging/fwbuilder.control
+1 -1
View File
@@ -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.3507-1
Version: 4.2.0.3508-1
Depends: libqt4-gui (>= 4.3.0), libxml2, libxslt1.1, libsnmp | libsnmp15
Description: Firewall Builder GUI and policy compilers
packaging/fwbuilder.spec
+1 -1
View File
@@ -1,6 +1,6 @@
%define name fwbuilder
%define version 4.2.0.3507
%define version 4.2.0.3508
%define release 1
%if "%_vendor" == "MandrakeSoft"
src/libgui/FWBSettings.cpp
+20 -8
View File
@@ -120,13 +120,16 @@ const char* newFirewallPlatform =
SETTINGS_PATH_PREFIX "/Objects/NewFireallPlatform";
const char* newClusterFailoverProtocol =
SETTINGS_PATH_PREFIX "/Objects/newClusterFailoverProtocol";
const char* appGUID = SETTINGS_PATH_PREFIX "/ApplicationGUID";
const char* abTestingGroup = SETTINGS_PATH_PREFIX "/abTestingGroup";
const char* startsCounter = SETTINGS_PATH_PREFIX "/startsCounter";
const char* targetStatus = SETTINGS_PATH_PREFIX "/TargetStatus/";
const char* SSHPath = SETTINGS_PATH_PREFIX "/SSH/SSHPath";
const char* SCPPath = SETTINGS_PATH_PREFIX "/SSH/SCPPath";
const char* appGUID = "/fwbuilder_gui/ApplicationGUID";
const char* appGUID_4_0 = "/4.0/ApplicationGUID";
const char* appGUID_4_1 = "/4.1/ApplicationGUID";
#ifdef _WIN32
const char* SSHTimeout = "Sessions/fwb_session_with_keepalive/PingIntervalSecs";
#else
@@ -187,17 +190,26 @@ void FWBSettings::init(bool force_first_time_run)
ok = uuid_settings->contains(appGUID);
if (!ok)
{
// migrate uuid from the old native format settings to uuid_settings
// See #1497
ok = contains(appGUID);
ok = uuid_settings->contains(appGUID_4_1);
if (ok)
{
uuid_settings->setValue(appGUID, value(appGUID).toString());
uuid_settings->setValue(
appGUID, uuid_settings->value(appGUID_4_1).toString());
uuid_settings->remove(appGUID_4_1);
} else
{
qsrand(time(NULL));
uuid_settings->setValue(appGUID, QUuid::createUuid().toString());
first_run = true;
ok = uuid_settings->contains(appGUID_4_0);
if (ok)
{
uuid_settings->setValue(
appGUID, uuid_settings->value(appGUID_4_0).toString());
uuid_settings->remove(appGUID_4_0);
} else
{
qsrand(time(NULL));
uuid_settings->setValue(appGUID, QUuid::createUuid().toString());
first_run = true;
}
}
}