Author: mzugec Date: Mon Jul 16 14:06:29 2007 New Revision: 39428 URL: http://svn.opensuse.org/viewcvs/yast?rev=39428&view=rev Log: don't disable Scopes for "Becomes DA Server" option (#291307) don't use lowercase options in slp.conf (#291301) 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/SlpServer.ycp 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=39428&r1=39427&r2=39428&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/slp-server/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/slp-server/VERSION Mon Jul 16 14:06:29 2007 @@ -1 +1 @@ -2.13.10 +2.13.11 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=39428&r1=39427&r2=39428&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 Mon Jul 16 14:06:29 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jul 16 14:08:59 CEST 2007 - mzugec@suse.cz + +- don't disable Scopes for "Becomes DA Server" option (#291307) +- don't use lowercase options in slp.conf (#291301) +- 2.13.11 + +------------------------------------------------------------------- Tue Jun 12 16:08:18 CEST 2007 - mzugec@suse.cz - fixed server configuration handling (#257568) 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=39428&r1=39427&r2=39428&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 Mon Jul 16 14:06:29 2007 @@ -25,6 +25,7 @@ import "Package"; import "Popup"; import "Confirm"; +import "Map"; include "slp-server/helps.ycp"; @@ -112,7 +113,7 @@ foreach(string k1, any v1, SETTINGS, { if (k1 == "value") { foreach(map v2, (list < map >)v1, { - if (v2["type"]:nil == 1) slp_config[v2["name"]:""]=v2["value"]:""; + if (v2["type"]:nil == 1) slp_config[tolower(v2["name"]:"") ]=v2["value"]:""; }); } }); @@ -125,11 +126,17 @@ // write global configuration file /etc/slp.conf boolean WriteGlobalConfig(){ 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]:""; v2["type"]=1; v2["value"]=v1; } @@ -303,8 +310,6 @@ * @return boolean True on success */ global boolean Import (map settings) { -y2internal("import %1", settings); -y2internal("slp_config %1", slp_config); foreach(string key, any value, (map)settings, { switch(key){ case("service") : @@ -320,7 +325,6 @@ break; } }); -y2internal("slp_config after %1", slp_config); return true; } @@ -338,7 +342,6 @@ ]; configured = true; -y2internal("export %1", result); return result; } 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=39428&r1=39427&r2=39428&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 Mon Jul 16 14:06:29 2007 @@ -537,7 +537,7 @@ break; case(`da_server) : y2milestone("Becomes DA Server"); UI::ChangeWidget(`id(`ip), `Enabled, false); - UI::ChangeWidget(`id(`scope), `Enabled, false); +// UI::ChangeWidget(`id(`scope), `Enabled, false); SlpServer::slp_config["net.slp.isda"]="true"; break; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org