diff --git a/build_num b/build_num index dfaf0adc0..367a8abbd 100644 --- a/build_num +++ b/build_num @@ -1 +1 @@ -#define BUILD_NUM 3188 +#define BUILD_NUM 3189 diff --git a/doc/ChangeLog b/doc/ChangeLog index 9fb3cfb42..d1f5ed913 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,5 +1,9 @@ 2010-08-02 Vadim Kurland + * InterfaceDialog.cpp (loadFWObject): fixed #1657 "When no network + zone is defined on the interface, the Interface object editor says + it is "Any" which is a lie" + * configlets/linux24/run_time_address_tables: fixed #1652 "support for adding single address to address table in the generated script". Generated iptables script now provides functions diff --git a/src/gui/InterfaceDialog.cpp b/src/gui/InterfaceDialog.cpp index e0ca84ddb..1518e90e2 100644 --- a/src/gui/InterfaceDialog.cpp +++ b/src/gui/InterfaceDialog.cpp @@ -295,7 +295,13 @@ void InterfaceDialog::loadFWObject(FWObject *o) QStringList netzoneObjectNames; - int n=0; + int n = 0; + + netzoneObjectIDs[0] = n; + netzoneObjectNos[n] = 0; + netzoneObjectNames.push_back(" None "); + + ++n; netzoneObjectIDs[FWObjectDatabase::ANY_ADDRESS_ID] = n; netzoneObjectNos[n] = FWObjectDatabase::ANY_ADDRESS_ID; @@ -357,7 +363,7 @@ void InterfaceDialog::loadFWObject(FWObject *o) m_dialog->netzone->addItems( netzoneObjectNames ); int id = FWObjectDatabase::getIntId(obj->getStr("network_zone")); - if (id==-1) id = FWObjectDatabase::ANY_ADDRESS_ID; // any network + if (id==-1) id = 0; m_dialog->netzone->setCurrentIndex( netzoneObjectIDs[id] ); } else