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

see #2070 fixing SF bug 3169045

Browse Source
This commit is contained in:
Vadim Kurland 2011-02-10 11:38:44 -08:00
parent 383d9e41d9
commit c5a0883f32
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/ChangeLog
View File

@ -1,5 +1,10 @@
2011-02-10 vadim <vadim@netcitadel.com>
* instDialog_ui_ops.cpp (summary): fixed SF bug 3169045: "Batch
installer lists IPv4 address as management address". The "summary"
display in the installer progress log output will now show putty
session name if it is used instead of the management address.
* NATCompiler_pf.cpp (processNext): fixes #2069 "PF: allow
multiple objects in ODst of redirecting nat rule". This fixes SF
bug 3162862 "NAT - more than one object in original destination"

22
src/libgui/FirewallInstaller.cpp
View File

@ -492,28 +492,14 @@ void FirewallInstaller::packSCPArgs(const QString &local_name,
if (!cnf->putty_session.isEmpty())
target = QString("%1%2:%3").arg(user_spec)
.arg(cnf->putty_session).arg(fwcompiler::CompilerDriver::escapeFileName(remote_name));
.arg(cnf->putty_session)
.arg(fwcompiler::CompilerDriver::escapeFileName(remote_name));
else
target = QString("%1%2:%3").arg(user_spec)
.arg(mgmt_addr).arg(fwcompiler::CompilerDriver::escapeFileName(remote_name));
.arg(mgmt_addr)
.arg(fwcompiler::CompilerDriver::escapeFileName(remote_name));
args.push_back(target);
/*
if (!cnf->putty_session.isEmpty())
{
args.push_back(cnf->putty_session + ":" +
fwcompiler::CompilerDriver::escapeFileName(remote_name));
} else
{
if (!cnf->user.isEmpty())
args.push_back(cnf->user + "@" + mgmt_addr + ":" +
fwcompiler::CompilerDriver::escapeFileName(remote_name));
else
args.push_back(mgmt_addr + ":" +
fwcompiler::CompilerDriver::escapeFileName(remote_name));
}
*/
}
/*

13
src/libgui/instDialog_ui_ops.cpp
View File

@ -491,9 +491,18 @@ void instDialog::summary()
str.append(QObject::tr("* Firewall name : %1")
.arg(QString::fromUtf8(cnf.fwobj->getName().c_str())));
str.append(QObject::tr("* Installer uses user name : %1").arg(cnf.user));
str.append(QObject::tr("* Management address : %1").arg(cnf.maddr));
// print destination machine address or name correctly, taking into
// account putty session if any
if (!cnf.putty_session.isEmpty())
str.append(QObject::tr("* Using putty session : %1").arg(cnf.putty_session));
str.append(QObject::tr("* Using putty session: %1").arg(cnf.putty_session));
else
str.append(QObject::tr("* Management address : %1").arg(cnf.maddr));
if (!cnf.putty_session.isEmpty())
str.append(QObject::tr("* Using putty session : %1")
.arg(cnf.putty_session));
str.append(QObject::tr("* Platform : %1")
.arg(cnf.fwobj->getStr("platform").c_str()));
str.append(QObject::tr("* Host OS : %1")