Author: aschnell Date: Fri May 14 14:17:58 2010 New Revision: 62015 URL: http://svn.opensuse.org/viewcvs/yast?rev=62015&view=rev Log: - fixed password dialog without validation password (bnc #604603) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/ep-dialogs.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=62015&r1=62014&r2=62015&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Fri May 14 14:17:58 2010 @@ -1,14 +1,19 @@ ------------------------------------------------------------------- -Sun May 9 14:45:33 UTC 2010 - novellbmw@lsmod.de - -- add sane chunk size values for RAID6 and RAID10 +Fri May 14 14:14:37 CEST 2010 - aschnell@suse.de + +- fixed password dialog without validation password (bnc #604603) - 2.19.13 ------------------------------------------------------------------- +Sun May 9 14:45:33 UTC 2010 - novellbmw@lsmod.de + +- add sane chunk size values for RAID6 and RAID10 + +------------------------------------------------------------------- Mon Apr 26 16:51:56 CEST 2010 - fehr@suse.de -- make alignment of created partitions configurable (optimal,cylinder) - to be able to work around problems like in bnc #597723 +- make alignment of created partitions configurable (optimal, + cylinder) to be able to work around problems like in bnc #597723 ------------------------------------------------------------------- Mon Apr 19 12:17:36 CEST 2010 - aschnell@suse.de @@ -47,7 +52,7 @@ ------------------------------------------------------------------- Thu Mar 25 18:24:35 CET 2010 - fehr@suse.de -- fix problems with detection of data on newly unlocked encrypted +- fix problems with detection of data on newly unlocked encrypted volumes (bnc #581341) ------------------------------------------------------------------- @@ -180,7 +185,7 @@ Wed Jan 13 18:56:03 CET 2010 - kmachalkova@suse.cz - Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su - where root privileges are needed, removed X-KDE-SubstituteUID key + where root privileges are needed, removed X-KDE-SubstituteUID key (bnc#540627) - 2.19.3 @@ -193,7 +198,7 @@ ------------------------------------------------------------------- Wed Jan 13 14:54:47 CET 2010 - fehr@suse.de -- set fs to detected fs when format is set to false to prevent +- set fs to detected fs when format is set to false to prevent invalid fstab options (bnc #457100) ------------------------------------------------------------------- @@ -210,13 +215,13 @@ ------------------------------------------------------------------- Mon Jan 11 18:55:11 CET 2010 - fehr@suse.de -- do not propose root partitions smaller than 512MB even in +- do not propose root partitions smaller than 512MB even in desperate mode (bnc #457092) ------------------------------------------------------------------- Mon Jan 11 16:11:00 CET 2010 - fehr@suse.de -- let libstorage determine affected devices when removing volumes +- let libstorage determine affected devices when removing volumes (bnc #426907) ------------------------------------------------------------------- Modified: trunk/storage/storage/src/include/ep-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-dialogs.ycp?rev=62015&r1=62014&r2=62015&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-dialogs.ycp Fri May 14 14:17:58 2010 @@ -480,7 +480,7 @@ integer min_pw_len = data["format"]:false ? 8 : 1; boolean empty_pw_allowed = EmptyCryptPwdAllowed(data); - boolean two_pw = data["format"]:false || size(data["mount"]:"")==0; + boolean two_pw = data["format"]:false || isempty(data["mount"]:""); string label = ""; @@ -521,7 +521,8 @@ //don't put those inside the loop - they'd be reset after each unsuccesful try UI::ChangeWidget(`id(`pw1), `Value, ""); - UI::ChangeWidget(`id(`pw2), `Value, ""); + if (two_pw) + UI::ChangeWidget(`id(`pw2), `Value, ""); string dev = (data["type"]:`unknown != `loop) ? data["device"]:"" : data["fpath"]:""; @@ -532,9 +533,12 @@ if (widget == `next) { password = (string) UI::QueryWidget(`id(`pw1), `Value); - string tmp = (string) UI::QueryWidget(`id(`pw2), `Value); - boolean need_verify = !data["format"]:false && - size(data["mount"]:"")>0; + + string tmp = password; + if (two_pw) + tmp = (string) UI::QueryWidget(`id(`pw2), `Value); + + boolean need_verify = !data["format"]:false && !isempty(data["mount"]:""); if (!Storage::CheckEncryptionPasswords(password, tmp, min_pw_len, empty_pw_allowed) || (need_verify && !Storage::CheckCryptOk(dev, password, false, false)) ) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org