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

fixes #802

Browse Source
This commit is contained in:
Vadim Kurland 2009-12-07 21:12:26 +00:00
parent d8598c1ee8
commit 5001ba1d92
3 changed files with 31 additions and 19 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 2044
#define BUILD_NUM 2045

36
src/gui/instOptionsDialog.cpp
View File

@ -58,23 +58,29 @@ instOptionsDialog::instOptionsDialog(QWidget *parent, instConf *_cnf) :
m_dialog->setupUi(this);
cnf = _cnf;
Firewall *fw = Firewall::cast(cnf->fwobj);
QString usrname = fw->getOptionsObject()->getStr("admUser").c_str();
int fw_id = -1;
if (cnf->fwobj)
{
// Note cnf->fwobj == NULL during batch install
fw_id = cnf->fwobj->getId();
}
QString username = cnf->user;
bool savePassEnabled = st->getBool("Environment/RememberSshPassEnabled");
m_dialog->rememberPass->setEnabled( savePassEnabled );
if (savePassEnabled)
{
m_dialog->rememberPass->setChecked( st->getBool("Environment/RememberSshPass") );
QPair<QString, QString> passwds = mw->passwords[qMakePair(cnf->fwobj->getId(),
usrname)];
m_dialog->rememberPass->setChecked(
st->getBool("Environment/RememberSshPass"));
QPair<QString, QString> passwds = mw->passwords[qMakePair(fw_id, username)];
m_dialog->pwd->setText(passwds.first);
m_dialog->epwd->setText(passwds.second);
}
else
m_dialog->rememberPass->setChecked( false );
m_dialog->rememberPass->setChecked(false);
m_dialog->pwd->setEchoMode( QLineEdit::Password );
m_dialog->epwd->setEchoMode( QLineEdit::Password );
m_dialog->pwd->setEchoMode(QLineEdit::Password);
m_dialog->epwd->setEchoMode(QLineEdit::Password);
m_dialog->uname->setText( cnf->user );
m_dialog->incr->setChecked( cnf->incremental );
@ -190,13 +196,19 @@ instOptionsDialog::instOptionsDialog(QWidget *parent, instConf *_cnf) :
void instOptionsDialog::savePassword()
{
Firewall *fw = Firewall::cast(cnf->fwobj);
fw->getOptionsObject()->setStr("admUser", m_dialog->uname->text().toStdString());
int fw_id = -1;
if (cnf->fwobj)
{
// Note cnf->fwobj == NULL during batch install
fw_id = cnf->fwobj->getId();
}
if ( m_dialog->rememberPass->isChecked() )
mw->passwords[qMakePair(cnf->fwobj->getId(), m_dialog->uname->text())] =
mw->passwords[qMakePair(fw_id, m_dialog->uname->text())] =
qMakePair(m_dialog->pwd->text(), m_dialog->epwd->text());
else
mw->passwords.remove(qMakePair(cnf->fwobj->getId(), m_dialog->uname->text()));
mw->passwords.remove(qMakePair(fw_id, m_dialog->uname->text()));
st->setBool("Environment/RememberSshPass", m_dialog->rememberPass->isChecked());
}

12
test/ipt/objects-for-regression-tests.fwb
View File

@ -29180,7 +29180,7 @@ echo '%FWBPROMPT%'; sh /tmp/%FWSCRIPT%
<Option name="verify_interfaces">False</Option>
</FirewallOptions>
</Firewall>
<Firewall id="id4833F62B6131" host_OS="linux24" inactive="False" lastCompiled="1251648548" lastInstalled="0" lastModified="1247356067" platform="iptables" version="" name="firewall-ipv6-1" comment="Using ULOG globally, but ipv6 rules&#10;should fall back to LOG because&#10;there is no ULOG for ip6tables yet&#10;Bug 2141911&#10;" ro="False">
<Firewall id="id4833F62B6131" host_OS="linux24" inactive="False" lastCompiled="1260217773" lastInstalled="0" lastModified="1247356067" platform="iptables" version="" name="firewall-ipv6-1" comment="Using ULOG globally, but ipv6 rules&#10;should fall back to LOG because&#10;there is no ULOG for ip6tables yet&#10;Bug 2141911&#10;" ro="False">
<NAT id="id4833F62F6131" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
<RuleSetOptions/>
</NAT>
@ -29876,7 +29876,7 @@ echo '%FWBPROMPT%'; sh /tmp/%FWSCRIPT%
<Routing id="id4833F6306131" name="Routing" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
<RuleSetOptions/>
</Routing>
<Interface id="id4833F6316131" dedicated_failover="False" dyn="False" label="" security_level="50" unnum="False" unprotected="False" name="eth0" comment="" ro="False">
<Interface id="id4833F6316131" dedicated_failover="False" dyn="False" label="" mgmt="True" security_level="50" unnum="False" unprotected="False" name="eth0" comment="" ro="False">
<IPv4 id="id4833F6326131" name="firewall-ipv6-1:eth0:ip" comment="" ro="False" address="1.1.1.1" netmask="255.255.255.0"/>
<IPv6 id="id4833F6346131" name="firewall-ipv6-1:eth0:ipv6" comment="" ro="False" address="fe80::21d:9ff:fe8b:8e94" netmask="64"/>
<InterfaceOptions/>
@ -29892,7 +29892,7 @@ echo '%FWBPROMPT%'; sh /tmp/%FWSCRIPT%
<Option name="action_on_reject"></Option>
<Option name="activationCmd"></Option>
<Option name="add_check_state_rule">true</Option>
<Option name="admUser"></Option>
<Option name="admUser">vadim</Option>
<Option name="altAddress"></Option>
<Option name="bridging_fw">False</Option>
<Option name="check_shading">True</Option>
@ -38269,7 +38269,7 @@ echo '%FWBPROMPT%'; sh /tmp/%FWSCRIPT%
<Option name="verify_interfaces">True</Option>
</FirewallOptions>
</Firewall>
<Firewall id="id55972X87590" host_OS="linux24" inactive="False" lastCompiled="1251648555" lastInstalled="0" lastModified="1247356189" platform="iptables" version="" name="firewall-ipv6-2" comment="Using ULOG globally, but ipv6 rules&#10;should fall back to LOG because&#10;there is no ULOG for ip6tables yet&#10;Bug 2141911&#10;" ro="False">
<Firewall id="id55972X87590" host_OS="linux24" inactive="False" lastCompiled="1260217780" lastInstalled="0" lastModified="1247356189" platform="iptables" version="" name="firewall-ipv6-2" comment="Using ULOG globally, but ipv6 rules&#10;should fall back to LOG because&#10;there is no ULOG for ip6tables yet&#10;Bug 2141911&#10;" ro="False">
<NAT id="id56353X87590" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
<RuleSetOptions/>
</NAT>
@ -38980,7 +38980,7 @@ echo '%FWBPROMPT%'; sh /tmp/%FWSCRIPT%
<Routing id="id56354X87590" name="Routing" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
<RuleSetOptions/>
</Routing>
<Interface id="id56355X87590" dedicated_failover="False" dyn="False" label="" security_level="50" unnum="False" unprotected="False" name="eth0" comment="" ro="False">
<Interface id="id56355X87590" dedicated_failover="False" dyn="False" label="" mgmt="True" security_level="50" unnum="False" unprotected="False" name="eth0" comment="" ro="False">
<IPv4 id="id56358X87590" name="firewall-ipv6-2:eth0:ip" comment="" ro="False" address="1.1.1.1" netmask="255.255.255.0"/>
<IPv6 id="id56359X87590" name="firewall-ipv6-2:eth0:ip6" comment="" ro="False" address="fe80::21d:9ff:fe8b:8e94" netmask="64"/>
<InterfaceOptions/>
@ -38996,7 +38996,7 @@ echo '%FWBPROMPT%'; sh /tmp/%FWSCRIPT%
<Option name="action_on_reject"></Option>
<Option name="activationCmd"></Option>
<Option name="add_check_state_rule">true</Option>
<Option name="admUser"></Option>
<Option name="admUser">vadim</Option>
<Option name="altAddress"></Option>
<Option name="bridging_fw">False</Option>
<Option name="check_shading">True</Option>