[yast-commit] r44185 - in /branches/SuSE-SLE-10-SP1-Branch/product-creator: VERSION package/yast2-product-creator.changes src/Kiwi.ycp src/kiwi_dialogs.ycp

Author: jsuchome Date: Wed Feb 6 13:32:29 2008 New Revision: 44185 URL: http://svn.opensuse.org/viewcvs/yast?rev=44185&view=rev Log: - save user password when importing configuration (bnc#357922) - 2.13.26.2 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION?rev=44185&r1=44184&r2=44185&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION Wed Feb 6 13:32:29 2008 @@ -1 +1 @@ -2.13.26.1 +2.13.26.2 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes?rev=44185&r1=44184&r2=44185&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes Wed Feb 6 13:32:29 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 5 12:11:09 CET 2008 - jsuchome@suse.cz + +- save user password when importing configuration (bnc#357922) +- 2.13.26.2 + +------------------------------------------------------------------- Fri Jan 25 13:58:02 CET 2008 - jsuchome@suse.cz - added support for keytable and timezone keys; save preferences Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp?rev=44185&r1=44184&r2=44185&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp Wed Feb 6 13:32:29 2008 @@ -331,9 +331,12 @@ foreach (string user, map usermap, (map) config["users"]:$[], { if (!haskey (ret, "users")) ret["users"] = $[]; + string pwd = usermap["pwd"]:""; + boolean crypted = (pwd != ""); ret["users",user] = $[ "home" : usermap["home"]:sformat ("/home/%1", user), - "pwd" : user, + "pwd" : (pwd == "") ? user : pwd, + "encrypted" : crypted, "group" : usermap["group"]:"", "username" : user, ]; @@ -522,7 +525,7 @@ $[ "__key" : "user", "name" : usermap["username"]:"", - "pwd" : crypt_password (usermap["pwd"]:""), + "pwd" : (usermap["encrypted"]:false) ? usermap["pwd"]:"" : crypt_password (usermap["pwd"]:""), "home" : usermap["home"]:"", ] )) Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp?rev=44185&r1=44184&r2=44185&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp Wed Feb 6 13:32:29 2008 @@ -415,6 +415,7 @@ group = username == "root" ? "root" : "users"; KiwiConfig["users", username] = $[ "pwd" : pwd, + "encrypted" : false, "home" : UI::QueryWidget (`id(`home), `Value), "group" : group, "username" : username, -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org