[yast-commit] r49267 - in /trunk/slp-server: VERSION package/yast2-slp-server.changes src/SlpServer.ycp src/dialogs.ycp

Author: mzugec Date: Mon Jul 21 13:12:13 2008 New Revision: 49267 URL: http://svn.opensuse.org/viewcvs/yast?rev=49267&view=rev Log: use correct cases for configuration options (bnc#291301) Modified: trunk/slp-server/VERSION trunk/slp-server/package/yast2-slp-server.changes trunk/slp-server/src/SlpServer.ycp trunk/slp-server/src/dialogs.ycp Modified: trunk/slp-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/slp-server/VERSION?rev=49267&r1=49266&r2=49267&view=diff ============================================================================== --- trunk/slp-server/VERSION (original) +++ trunk/slp-server/VERSION Mon Jul 21 13:12:13 2008 @@ -1 +1 @@ -2.16.2 +2.17.0 Modified: trunk/slp-server/package/yast2-slp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/slp-server/package/yast2-slp-server.changes?rev=49267&r1=49266&r2=49267&view=diff ============================================================================== --- trunk/slp-server/package/yast2-slp-server.changes (original) +++ trunk/slp-server/package/yast2-slp-server.changes Mon Jul 21 13:12:13 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jul 21 13:10:08 CEST 2008 - mzugec@suse.cz + +- use correct cases for configuration options (bnc#291301) +- 2.17.0 + +------------------------------------------------------------------- Fri May 16 16:40:22 CEST 2008 - jsrain@suse.cz - added categories Settings and System into desktop file Modified: trunk/slp-server/src/SlpServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/slp-server/src/SlpServer.ycp?rev=49267&r1=49266&r2=49267&view=diff ============================================================================== --- trunk/slp-server/src/SlpServer.ycp (original) +++ trunk/slp-server/src/SlpServer.ycp Mon Jul 21 13:12:13 2008 @@ -126,18 +126,47 @@ // write global configuration file /etc/slp.conf boolean WriteGlobalConfig(){ + list<string> correct_case2 = [ +"net.slp.useScopes", +"net.slp.DAAddresses", +"net.slp.isDA", +"net.slp.DAHeartBeat", +"net.slp.watchRegistrationPID", +"net.slp.maxResults", +"net.slp.isBroadcastOnly", +"net.slp.passiveDADetection", +"net.slp.activeDADetection", +"net.slp.DAActiveDiscoveryInterval", +"net.slp.multicastTTL", +"net.slp.DADiscoveryMaximumWait", +"net.slp.DADiscoveryTimeouts", +"net.slp.multicastMaximumWait", +"net.slp.multicastTimeouts", +"net.slp.unicastMaximumWait", +"net.slp.unicastTimeouts", +"net.slp.datagramTimeouts", +"net.slp.randomWaitBound", +"net.slp.MTU", +"net.slp.interfaces", +"net.slp.securityEnabled", +"net.slp.checkSourceAddr", +"net.slp.traceDATraffic", +"net.slp.traceReg", +"net.slp.traceDrop", +"net.slp.traceMsg" +]; foreach(string k1, any v1, slp_config, { - map correct_case = $[ - "net.slp.usescopes":"net.slp.useScopes", - "net.slp.daaddresses":"net.slp.DAAddresses", - "net.slp.isbroadcastonly":"net.slp.isBroadcastOnly" - ]; SETTINGS["value"] = maplist(map v2, (list < map >) SETTINGS["value"]:nil, { if (k1 == v2["name"]:"") { if (v1 == nil) v2["type"]=0; else { - if (contains(Map::Keys(correct_case), k1)) v2["name"] = correct_case[k1]:""; + foreach(string s, correct_case2, { + if (tolower(s)==k1){ + v2["name"] = s; + break; + } + }); v2["type"]=1; v2["value"]=v1; } @@ -211,7 +240,6 @@ // check if user is root if(!Confirm::MustBeRoot()) return false; if(!NetworkService::RunningNetworkPopup()) return false; - Progress::NextStage(); if(false) return false; sleep(sl); Modified: trunk/slp-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/slp-server/src/dialogs.ycp?rev=49267&r1=49266&r2=49267&view=diff ============================================================================== --- trunk/slp-server/src/dialogs.ycp (original) +++ trunk/slp-server/src/dialogs.ycp Mon Jul 21 13:12:13 2008 @@ -21,8 +21,6 @@ import "TablePopup"; import "LogView"; import "IP"; -import "String"; - include "slp-server/helps.ycp"; void initServerSettings(string key); @@ -556,7 +554,7 @@ else if (SlpServer::slp_config["net.slp.isbroadcastonly"]:"false" == "true") mode = `bc; else - if (size(String::CutBlanks(SlpServer::slp_config["net.slp.daaddresses"]:""))>0) mode = `da; + if (size(deletechars(SlpServer::slp_config["net.slp.daaddresses"]:"", " "))>0) mode = `da; else mode = `mc; UI::ChangeWidget(`id(`resp), `CurrentButton, mode); changeResponseTo(mode); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org