Author: mzugec Date: Tue Nov 27 15:35:35 2007 New Revision: 42448 URL: http://svn.opensuse.org/viewcvs/yast?rev=42448&view=rev Log: list of all configuration options for correct case (#291301) Modified: branches/SuSE-SLE-10-SP2-Branch/slp-server/src/SlpServer.ycp branches/SuSE-SLE-10-SP2-Branch/slp-server/src/dialogs.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/slp-server/src/SlpServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/slp-server/src/SlpServer.ycp?rev=42448&r1=42447&r2=42448&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/slp-server/src/SlpServer.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/slp-server/src/SlpServer.ycp Tue Nov 27 15:35:35 2007 @@ -125,18 +125,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<string, string> correct_case = $[ - "net.slp.usescopes":"net.slp.useScopes", - "net.slp.daaddresses":"net.slp.DAAddresses", - "net.slp.isbroadcastonly":"net.slp.isBroadcastOnly" - ]; SETTINGS["value"] = maplist(map<string, any > v2, (list < map<string, any> >) 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; } 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=42448&r1=42447&r2=42448&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 Nov 27 15:35:35 2007 @@ -554,7 +554,7 @@ else if (SlpServer::slp_config["net.slp.isbroadcastonly"]:"false" == "true") mode = `bc; else - if (size(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