Author: mzugec Date: Mon Dec 15 16:31:19 2008 New Revision: 54142 URL: http://svn.opensuse.org/viewcvs/yast?rev=54142&view=rev Log: allow more than one DA IP address(bnc#430336) Modified: branches/SuSE-Code-11-Branch/slp-server/VERSION branches/SuSE-Code-11-Branch/slp-server/package/yast2-slp-server.changes branches/SuSE-Code-11-Branch/slp-server/src/dialogs.ycp Modified: branches/SuSE-Code-11-Branch/slp-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/slp-server/VERSION?rev=54142&r1=54141&r2=54142&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/slp-server/VERSION (original) +++ branches/SuSE-Code-11-Branch/slp-server/VERSION Mon Dec 15 16:31:19 2008 @@ -1 +1 @@ -2.17.1 +2.17.2 Modified: branches/SuSE-Code-11-Branch/slp-server/package/yast2-slp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/slp-server/package/yast2-slp-server.changes?rev=54142&r1=54141&r2=54142&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/slp-server/package/yast2-slp-server.changes (original) +++ branches/SuSE-Code-11-Branch/slp-server/package/yast2-slp-server.changes Mon Dec 15 16:31:19 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Dec 15 16:28:52 CET 2008 - mzugec@suse.cz + +- allow more than one DA IP address(bnc#430336) +- 2.17.2 + +------------------------------------------------------------------- Mon Sep 29 09:17:22 CEST 2008 - mzugec@suse.de - fixed menu category for gnome (bnc#429429) Modified: branches/SuSE-Code-11-Branch/slp-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/slp-server/src/dialogs.ycp?rev=54142&r1=54141&r2=54142&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/slp-server/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-Branch/slp-server/src/dialogs.ycp Mon Dec 15 16:31:19 2008 @@ -21,6 +21,7 @@ import "TablePopup"; import "LogView"; import "IP"; +import "String"; include "slp-server/helps.ycp"; void initServerSettings(string key); @@ -548,7 +549,7 @@ define void initServerSettings(string key) ``{ symbol mode = nil; keys = []; - UI::ChangeWidget(`id(`ip), `Value, SlpServer::slp_config["net.slp.daaddresses"]:""); + UI::ChangeWidget(`id(`ip), `Value, String::CutBlanks( SlpServer::slp_config["net.slp.daaddresses"]:"") ); UI::ChangeWidget(`id(`scope), `Value, SlpServer::slp_config["net.slp.usescopes"]:""); if (SlpServer::slp_config["net.slp.isda"]:"false" == "true") mode = `da_server; else @@ -577,11 +578,15 @@ { if (UI::QueryWidget(`id(`resp), `CurrentButton) == `da) { - if ( !IP::Check((string)UI::QueryWidget(`id(`ip), `Value)) || UI::QueryWidget(`id(`scope), `Value)=="" ) - { + boolean ip_valid = true; + if ((string)UI::QueryWidget(`id(`ip), `Value) == "") ip_valid = false; + foreach(string ip, splitstring((string)UI::QueryWidget(`id(`ip), `Value), ","), { + if(!IP::Check(String::CutBlanks(ip))) ip_valid = false; + }); + if (!ip_valid){ Popup::Error (_("Scope and IP address must be inserted.")); return false; - } + } } if (UI::QueryWidget(`id(`resp), `CurrentButton) == `mc) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org