Author: mzugec Date: Tue Jun 12 16:22:05 2007 New Revision: 38408 URL: http://svn.opensuse.org/viewcvs/yast?rev=38408&view=rev Log: fixed server configuration handling (#257568) Modified: branches/SuSE-SLE-10-SP2-Branch/slp-server/VERSION branches/SuSE-SLE-10-SP2-Branch/slp-server/package/yast2-slp-server.changes branches/SuSE-SLE-10-SP2-Branch/slp-server/src/dialogs.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/slp-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/slp-server/VERSION?rev=38408&r1=38407&r2=38408&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/slp-server/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/slp-server/VERSION Tue Jun 12 16:22:05 2007 @@ -1 +1 @@ -2.13.9 +2.13.10 Modified: branches/SuSE-SLE-10-SP2-Branch/slp-server/package/yast2-slp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/slp-server/package/yast2-slp-server.changes?rev=38408&r1=38407&r2=38408&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/slp-server/package/yast2-slp-server.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/slp-server/package/yast2-slp-server.changes Tue Jun 12 16:22:05 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jun 12 16:08:18 CEST 2007 - mzugec@suse.cz + +- fixed server configuration handling (#257568) +- 2.13.10 + +------------------------------------------------------------------- Tue Nov 21 10:37:10 CET 2006 - mzugec@suse.cz - #219445 - slp-server with broken msgid Modified: branches/SuSE-SLE-10-SP2-Branch/slp-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/slp-server/src/dialogs.ycp?rev=38408&r1=38407&r2=38408&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/slp-server/src/dialogs.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/slp-server/src/dialogs.ycp Tue Jun 12 16:22:05 2007 @@ -20,7 +20,7 @@ import "CWMFirewallInterfaces"; import "TablePopup"; import "LogView"; - +import "IP"; include "slp-server/helps.ycp"; void initServerSettings(string key); @@ -550,13 +550,12 @@ keys = []; UI::ChangeWidget(`id(`ip), `Value, SlpServer::slp_config["net.slp.daaddresses"]:""); UI::ChangeWidget(`id(`scope), `Value, SlpServer::slp_config["net.slp.usescopes"]:""); - if (SlpServer::slp_config["net.slp.isda"]:"" == "true") mode = `da_server; + if (SlpServer::slp_config["net.slp.isda"]:"false" == "true") mode = `da_server; else if (SlpServer::slp_config["net.slp.isbroadcastonly"]:"false" == "true") mode = `bc; else - if (SlpServer::slp_config["net.slp.passivedadetection"]:"false" == "false") mode = `mc; - else mode = `da; - + if (size(SlpServer::slp_config["net.slp.daaddresses"]:"")>0) mode = `da; + else mode = `mc; UI::ChangeWidget(`id(`resp), `CurrentButton, mode); changeResponseTo(mode); } @@ -578,7 +577,7 @@ { if (UI::QueryWidget(`id(`resp), `CurrentButton) == `da) { - if ( UI::QueryWidget(`id(`ip), `Value)=="" || UI::QueryWidget(`id(`scope), `Value)=="" ) + if ( !IP::Check((string)UI::QueryWidget(`id(`ip), `Value)) || UI::QueryWidget(`id(`scope), `Value)=="" ) { Popup::Error (_("Scope and IP address must be inserted.")); return false; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org