February 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r61048 - in /branches/SuSE-Code-11-SP1-Branch/storage: package/yast2-storage.changes storage/src/include/ep-lvm-dialogs.ycp
by aschnell＠svn.opensuse.org 26 Feb '10

26 Feb '10

Author: aschnell Date: Fri Feb 26 15:04:22 2010 New Revision: 61048 URL: http://svn.opensuse.org/viewcvs/yast?rev=61048&view=rev Log: - mark messages for translation (bnc #580855) Modified: branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-SP1-Branch/storage/storage/src/include/ep-lvm-dialogs.ycp Modified: branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Fri Feb 26 15:04:22 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Feb 26 15:02:54 CET 2010 - aschnell(a)suse.de + +- mark messages for translation (bnc #580855) + +------------------------------------------------------------------- Thu Feb 25 13:00:45 CET 2010 - aschnell(a)suse.de - fixed proposal workflow on S390 (bnc #583119) Modified: branches/SuSE-Code-11-SP1-Branch/storage/storage/src/include/ep-lvm-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/storage/src/include/ep-lvm-dialogs.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/storage/src/include/ep-lvm-dialogs.ycp Fri Feb 26 15:04:22 2010 @@ -196,7 +196,7 @@ }); // label for input field - contents = add(contents, `Left(`InputField(`id("vgname"), "Volume Group Name"))); + contents = add(contents, `Left(`InputField(`id("vgname"), _("Volume Group Name")))); contents = add(contents, `Left(`ComboBoxSelected(`id("pesize"), `opt(`editable), // label for combo box _("&Physical Extent Size"), pesizes_list, `id(pesize)))); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r61047 - in /trunk/packager: package/yast2-packager.changes src/modules/ProductLicense.ycp
by locilka＠svn.opensuse.org 26 Feb '10

26 Feb '10

Author: locilka Date: Fri Feb 26 14:53:43 2010 New Revision: 61047 URL: http://svn.opensuse.org/viewcvs/yast?rev=61047&view=rev Log: - Calling ProductLicense cleanup before leaving the license dialog (BNC #581933). Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/ProductLicense.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Fri Feb 26 14:53:43 2010 @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 26 14:46:32 CET 2010 - locilka(a)suse.cz + +- Calling ProductLicense cleanup before leaving the license dialog + (BNC #581933). + ------------------------------------------------------------------ Thu Jan 14 13:40:25 UTC 2010 - lslezak(a)suse.cz Modified: trunk/packager/src/modules/ProductLicense.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/ProductLice… ============================================================================== --- trunk/packager/src/modules/ProductLicense.ycp (original) +++ trunk/packager/src/modules/ProductLicense.ycp Fri Feb 26 14:53:43 2010 @@ -963,6 +963,15 @@ } /** + * Generic cleanup + */ +void CleanUp() { + // BNC #581933: All license IDs are cached while the module is in memory. + // Removing them when leaving the license dialog. + license_ids = []; +} + +/** * Ask user to confirm license agreement * @param src_id integer repository to get the license from. * If set to 'nil', the license is considered to belong to a base product @@ -1035,6 +1044,8 @@ Wizard::CloseDialog(); } + CleanUp(); + return ret; } @@ -1158,6 +1169,8 @@ Wizard::CloseDialog(); } + CleanUp(); + return ret; } @@ -1221,6 +1234,8 @@ } } + CleanUp(); + return true; } @@ -1250,6 +1265,8 @@ } } + CleanUp(); + return true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r61046 - /tags/branch-Code-11-SP1-2_17_70/packager/
by locilka＠svn.opensuse.org 26 Feb '10

26 Feb '10

Author: locilka Date: Fri Feb 26 14:49:00 2010 New Revision: 61046 URL: http://svn.opensuse.org/viewcvs/yast?rev=61046&view=rev Log: Created tag branch-Code-11-SP1-2_17_70 for packager Added: tags/branch-Code-11-SP1-2_17_70/packager/ (props changed) - copied from r61045, branches/SuSE-Code-11-SP1-Branch/packager/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r61045 - /tags/branch-Code-11-SP1-2_17_70/
by locilka＠svn.opensuse.org 26 Feb '10

26 Feb '10

Author: locilka Date: Fri Feb 26 14:48:58 2010 New Revision: 61045 URL: http://svn.opensuse.org/viewcvs/yast?rev=61045&view=rev Log: Created tag branch-Code-11-SP1-2_17_70 Added: tags/branch-Code-11-SP1-2_17_70/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r61044 - in /branches/SuSE-Code-11-SP1-Branch/packager: VERSION package/yast2-packager.changes src/modules/ProductLicense.ycp
by locilka＠svn.opensuse.org 26 Feb '10

26 Feb '10

Author: locilka Date: Fri Feb 26 14:48:35 2010 New Revision: 61044 URL: http://svn.opensuse.org/viewcvs/yast?rev=61044&view=rev Log: - Calling ProductLicense cleanup before leaving the license dialog (BNC #581933). - 2.17.70 Modified: branches/SuSE-Code-11-SP1-Branch/packager/VERSION branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes branches/SuSE-Code-11-SP1-Branch/packager/src/modules/ProductLicense.ycp Modified: branches/SuSE-Code-11-SP1-Branch/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/VERSION Fri Feb 26 14:48:35 2010 @@ -1 +1 @@ -2.17.69 +2.17.70 Modified: branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes Fri Feb 26 14:48:35 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Feb 26 14:46:32 CET 2010 - locilka(a)suse.cz + +- Calling ProductLicense cleanup before leaving the license dialog + (BNC #581933). +- 2.17.70 + +------------------------------------------------------------------- Wed Jan 27 15:41:46 UTC 2010 - lslezak(a)suse.cz - repositories - added NFSv4 support (fate#306451), don't loose Modified: branches/SuSE-Code-11-SP1-Branch/packager/src/modules/ProductLicense.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/src/modules/ProductLicense.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/src/modules/ProductLicense.ycp Fri Feb 26 14:48:35 2010 @@ -963,6 +963,15 @@ } /** + * Generic cleanup + */ +void CleanUp() { + // BNC #581933: All license IDs are cached while the module is in memory. + // Removing them when leaving the license dialog. + license_ids = []; +} + +/** * Ask user to confirm license agreement * @param src_id integer repository to get the license from. * If set to 'nil', the license is considered to belong to a base product @@ -1035,6 +1044,8 @@ Wizard::CloseDialog(); } + CleanUp(); + return ret; } @@ -1158,6 +1169,8 @@ Wizard::CloseDialog(); } + CleanUp(); + return ret; } @@ -1221,6 +1234,8 @@ } } + CleanUp(); + return true; } @@ -1250,6 +1265,8 @@ } } + CleanUp(); + return true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r61043 - /tags/stable-2_19_4/users/
by jsuchome＠svn.opensuse.org 26 Feb '10

26 Feb '10

Author: jsuchome Date: Fri Feb 26 14:48:12 2010 New Revision: 61043 URL: http://svn.opensuse.org/viewcvs/yast?rev=61043&view=rev Log: Created tag stable-2_19_4 for users Added: tags/stable-2_19_4/users/ - copied from r61042, trunk/users/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r61042 - in /trunk/users: ./ package/ src/ testsuite/tests/
by jsuchome＠svn.opensuse.org 26 Feb '10

26 Feb '10

Author: jsuchome Date: Fri Feb 26 14:48:03 2010 New Revision: 61042 URL: http://svn.opensuse.org/viewcvs/yast?rev=61042&view=rev Log: - password warnings merged into one big message (bnc#571777) - 2.19.4 Modified: trunk/users/VERSION trunk/users/package/yast2-users.changes trunk/users/src/UsersSimple.pm trunk/users/src/dialogs.ycp trunk/users/src/inst_root.ycp trunk/users/src/inst_root_first.ycp trunk/users/src/inst_user_first.ycp trunk/users/testsuite/tests/CheckPassword.out trunk/users/testsuite/tests/CheckPassword.ycp Modified: trunk/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/VERSION?rev=61042&r1=61041… ============================================================================== --- trunk/users/VERSION (original) +++ trunk/users/VERSION Fri Feb 26 14:48:03 2010 @@ -1 +1 @@ -2.19.3 +2.19.4 Modified: trunk/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.change… ============================================================================== --- trunk/users/package/yast2-users.changes (original) +++ trunk/users/package/yast2-users.changes Fri Feb 26 14:48:03 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 26 14:20:43 CET 2010 - jsuchome(a)suse.cz + +- password warnings merged into one big message (bnc#571777) +- 2.19.4 + +------------------------------------------------------------------- Tue Feb 16 14:01:20 CET 2010 - jsuchome(a)suse.cz - empty hash before reading, to avoid caching problems (bnc#580167) Modified: trunk/users/src/UsersSimple.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/UsersSimple.pm?rev=610… ============================================================================== --- trunk/users/src/UsersSimple.pm (original) +++ trunk/users/src/UsersSimple.pm Fri Feb 26 14:48:03 2010 @@ -615,12 +615,10 @@ if ($pw =~ m/$name/) { if ($what eq "groups") { # popup question - return __("You have used the group name as a part of the password. -This is not a good security practice. Really use this password?"); + return __("You have used the group name as a part of the password."); } # popup question - return __("You have used the username as a part of the password. -This is not a good security practice. Really use this password?"); + return __("You have used the username as a part of the password."); } # check for lowercase @@ -628,8 +626,7 @@ $filtered =~ s/[[:lower:]]//g; if ($filtered eq "") { # popup question - return __("You have used only lowercase letters for the password. -This is not a good security practice. Really use this password?"); + return __("You have used only lowercase letters for the password."); } # check for uppercase @@ -637,16 +634,14 @@ $filtered =~ s/[[:upper:]]//g; if ($filtered eq "") { # popup question - return __("You have used only uppercase letters for the password. -This is not a good security practice. Really use this password?"); + return __("You have used only uppercase letters for the password."); } # check for palindroms $filtered = reverse $pw; if ($filtered eq $pw) { # popup question - return __("You have used a palindrom for the password. -This is not a good security practice. Really use this password?"); + return __("You have used a palindrom for the password."); } # check for numbers @@ -654,8 +649,7 @@ $filtered =~ s/[0-9]//g; if ($filtered eq "") { # popup question - return __("You have used only digits for the password. -This is not a good security practice. Really use this password?"); + return __("You have used only digits for the password."); } return ""; } @@ -678,7 +672,7 @@ if (length ($pw) > $max_length) { # popup question $ret = sprintf (__("The password is too long for the current encryption method. -Truncate it to %s characters?"), $max_length); +It will be truncated to %s characters."), $max_length); } return $ret; } @@ -736,72 +730,55 @@ return ""; } -##------------------------------------ # Check the password of given user or group: part 2, checking for # problems that may be skipped (accepted) by user # @param data map containing user/group name, password and type -# @param answer map containing all the problems that were already skipped by -# user -# @return value is map with the problem found FIXME example +# +# Merges all error reports and returns them in the list BEGIN { $TYPEINFO{CheckPasswordUI} = ["function", - ["map", "string", "string"], - ["map", "string", "any"], ["map", "string", "any"]]; + ["list", "string"], + ["map", "string", "any"]]; } sub CheckPasswordUI { - my ($self, $data, $ui_map) = @_; + my ($self, $data) = @_; my $pw = $data->{"userPassword"} || ""; my $name = $data->{"uid"}; $name = ($data->{"cn"} || "") if (!defined $name); my $type = $data->{"type"} || "local"; my $min_length = $self->GetMinPasswordLength ($type); - my %ret = (); + my @ret = (); if ($pw eq "") { - return \%ret; + return \@ret; } - if ($self->CrackLibUsed () && (($ui_map->{"crack"} || "") ne $pw)) { + if ($self->CrackLibUsed ()) { my $error = $self->CrackPassword ($pw); if ($error ne "") { - $ret{"question_id"} = "crack"; - # popup question - $ret{"question"} = sprintf (__("The password is too simple: -%s -Really use this password?"), $error); - return \%ret; + # error message + push @ret, sprintf (__("The password is too simple: +%s."), $error); } } - if ($self->ObscureChecksUsed () && (($ui_map->{"obscure"} || "") ne $pw)) { + if (1) {#$self->ObscureChecksUsed ()) { my $what = "users"; $what = "groups" if (! defined $data->{"uid"}); my $error = $self->CheckObscurity ($name, $pw, $what); - if ($error ne "") { - $ret{"question_id"} = "obscure"; - $ret{"question"} = $error; - return \%ret; - } + push @ret, $error if $error; } - if (($ui_map->{"short"} || "") ne $pw) { - if (length ($pw) < $min_length) { - $ret{"question_id"} = "short"; - # popup questionm, %i is number - $ret{"question"} = sprintf (__("The password should have at least %i characters. -Really use this shorter password?"), $min_length); - } + if (length ($pw) < $min_length) { + # popup error, %i is number + push @ret, sprintf (__("The password should have at least %i characters."), $min_length); } - if (($ui_map->{"truncate"} || "") ne $pw) { - my $error = $self->CheckPasswordMaxLength ($pw, $type); - if ($error ne "") { - $ret{"question_id"} = "truncate"; - $ret{"question"} = $error; - } - } - return \%ret; + my $error = $self->CheckPasswordMaxLength ($pw, $type); + push @ret, $error if $error; + + return \@ret; } ##------------------------------------ Modified: trunk/users/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/dialogs.ycp?rev=61042&… ============================================================================== --- trunk/users/src/dialogs.ycp (original) +++ trunk/users/src/dialogs.ycp Fri Feb 26 14:48:03 2010 @@ -1046,29 +1046,22 @@ focus_tab (current, `pw1); continue; } - boolean failed = false; - do - { - error_map = UsersSimple::CheckPasswordUI ($[ + + list<string> errors = UsersSimple::CheckPasswordUI ($[ "uid" : username, "userPassword" : pw1, "type" : user_type - ], ui_map); - if (error_map != $[]) + ]); + if (errors != []) + { + string message = mergestring (errors, "\n\n") + + // last part of message popup + "\n\n" + _("Really use this password?"); + if (!Popup::YesNo (message)) { - if (!Popup::YesNo (error_map ["question"]:"")) - { - failed = true; - } - else - ui_map[ error_map["question_id"]:"" ] = pw1; + focus_tab (current, `pw1); + continue; } - } while (error_map != $[] && !failed); - - if (failed) - { - focus_tab (current, `pw1); - continue; } // now saving plain text password if (user["encrypted"]:false) @@ -2116,29 +2109,24 @@ focus_tab (current, `pw1); continue; } - boolean failed = false; - do - { - error_map = UsersSimple::CheckPasswordUI ($[ + + list<string> errors = UsersSimple::CheckPasswordUI ($[ "cn" : new_groupname, "userPassword" : pw1, "type" : group_type - ], ui_map); - if (error_map != $[]) + ]); + if (errors != []) + { + string message = mergestring (errors, "\n\n") + + // last part of message popup + "\n\n" + _("Really use this password?"); + if (!Popup::YesNo (message)) { - if (!Popup::YesNo (error_map ["question"]:"")) - { - failed = true; - } - else - ui_map[ error_map["question_id"]:"" ] = pw1; + focus_tab (current, `pw1); + continue; } - } while (error_map != $[] && !failed); - if (failed) - { - focus_tab (current, `pw1); - continue; } + password = pw1; if (group["encrypted"]:false) group["encrypted"] = false; Modified: trunk/users/src/inst_root.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/inst_root.ycp?rev=6104… ============================================================================== --- trunk/users/src/inst_root.ycp (original) +++ trunk/users/src/inst_root.ycp Fri Feb 26 14:48:03 2010 @@ -124,10 +124,11 @@ // help text for 'test keyboard layout' entry' helptext = helptext + _("<p>To check whether your current keyboard layout is correct, try entering text into the <b>Test Keyboard Layout</b> field.</p>"); + if (Mode::normal ()) Wizard::CreateDialog (); // for testing only Wizard::SetDesktopIcon("users"); Wizard::SetContents (title, contents, helptext, - GetInstArgs::enable_back(), - GetInstArgs::enable_next()); + GetInstArgs::enable_back() || Mode::normal (), + GetInstArgs::enable_next() || Mode::normal ()); symbol ret = nil; @@ -198,53 +199,30 @@ continue; } - // map returned from CheckPasswordUI functions - map error_map = $[]; - // map with id's of confirmed questions - map<string,any> ui_map = $[]; - boolean failed = false; + list<string> errors = UsersSimple::CheckPasswordUI ($[ + "uid" : "root", + "userPassword" : pw1, + "type" : "system", + ]); if (check_CA_constraints && (size (pw1) < pw_min_CA)) { - if (Popup::YesNo (sformat ( + errors = add (errors, sformat ( // yes/no popup question, %1 is a number _("If you intend to create certificates, -the password should have at least %1 characters. -Really use this shorter password?"), pw_min_CA))) - { - // skip other checks for short passwords - ui_map["short"] = 1; - } - else - { - ret = `notnext; - continue; - } +the password should have at least %1 characters."), pw_min_CA)); } - do + + if (errors != []) { - error_map = UsersSimple::CheckPasswordUI ($[ - "uid" : "root", - "userPassword" : pw1, - "type" : "system", - ], ui_map); - if (error_map != $[]) + string message = mergestring (errors, "\n\n") + + // last part of message popup + "\n\n" + _("Really use this password?"); + if (!Popup::YesNo (message)) { - if (!Popup::YesNo (error_map ["question"]:"")) - { - failed = true; - } - else - { - ui_map[ error_map["question_id"]:"" ] = pw1; - } + ret = `notnext; + continue; } - } while (error_map != $[] && !failed); - - if (failed) - { - ret = `notnext; - continue; } Users::WriteSecurity (); @@ -269,5 +247,6 @@ } } until (ret == `next || ret == `back || ret == `abort); + if (Mode::normal ()) Wizard::CloseDialog (); return ret; } Modified: trunk/users/src/inst_root_first.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/inst_root_first.ycp?re… ============================================================================== --- trunk/users/src/inst_root_first.ycp (original) +++ trunk/users/src/inst_root_first.ycp Fri Feb 26 14:48:03 2010 @@ -100,8 +100,8 @@ Wizard::SetTitleIcon("yast-users"); Wizard::SetContents (title, contents, helptext, - GetInstArgs::enable_back(), - GetInstArgs::enable_next()); + GetInstArgs::enable_back() || Mode::normal (), + GetInstArgs::enable_next() || Mode::normal ()); symbol ret = nil; @@ -164,44 +164,33 @@ y2error ("loading cracklib failed, not used for pw check"); UsersSimple::UseCrackLib (false); } + + list<string> errors = UsersSimple::CheckPasswordUI ($[ + "uid" : "root", + "userPassword" : pw1, + "type" : "system", + ]); + if (check_CA_constraints && (size (pw1) < pw_min_CA)) { - if (Popup::YesNo (sformat ( + errors = add (errors, sformat ( // yes/no popup question, %1 is a number _("If you intend to create certificates, -the password should have at least %1 characters. -Really use this shorter password?"), pw_min_CA))) - { - // skip other checks for short passwords - ui_map["short"] = pw1; - } - else +the password should have at least %1 characters."), pw_min_CA)); + } + + if (errors != []) + { + string message = mergestring (errors, "\n\n") + + // last part of message popup + "\n\n" + _("Really use this password?"); + if (!Popup::YesNo (message)) { ret = `notnext; continue; } } - do - { - error_map = UsersSimple::CheckPasswordUI ($[ - "uid" : "root", - "userPassword" : pw1, - "type" : "system", - ], ui_map); - if (error_map != $[]) - { - if (!Popup::YesNo (error_map ["question"]:"")) - failed = true; - else - ui_map[ error_map["question_id"]:"" ] = pw1; - } - } while (error_map != $[] && !failed); - if (failed) - { - ret = `notnext; - continue; - } UsersSimple::SetRootPassword (pw1); UsersSimple::UnLoadCracklib (); } Modified: trunk/users/src/inst_user_first.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/inst_user_first.ycp?re… ============================================================================== --- trunk/users/src/inst_user_first.ycp (original) +++ trunk/users/src/inst_user_first.ycp Fri Feb 26 14:48:03 2010 @@ -688,51 +688,40 @@ UI::SetFocus (`id (`pw1)); continue; } - boolean failed = false; - if (root_pw && check_CA_constraints && size (pw1) < pw_min_CA) - { - if (Popup::YesNo (sformat ( -// yes/no popup question, %1 is a number -_("If you intend to create certificates, -the password should have at least %1 characters. -Really use this shorter password?"), pw_min_CA))) - { - // skip other checks for short passwords - ui_map["short"] = pw1; - } - else - { - ret = `notnext; - UI::SetFocus (`id (`pw1)); - continue; - } - } + if (!UsersSimple::LoadCracklib ()) { y2error ("loading cracklib failed, not used for pw check"); UsersSimple::UseCrackLib (false); } - do - { - error_map = UsersSimple::CheckPasswordUI ($[ + + list<string> errors = UsersSimple::CheckPasswordUI ($[ "uid" : username, "userPassword" : pw1, "type" : "local", - ], ui_map); - if (error_map != $[]) - { - if (!Popup::YesNo (error_map ["question"]:"")) - failed = true; - else - ui_map[ error_map["question_id"]:"" ] = pw1; - } - } while (error_map != $[] && !failed); + ]); - if (failed) + if (root_pw && check_CA_constraints && (size (pw1) < pw_min_CA)) { - UI::SetFocus (`id (`pw1)); - continue; + errors = add (errors, sformat ( +// yes/no popup question, %1 is a number +_("If you intend to create certificates, +the password should have at least %1 characters."), pw_min_CA)); + } + + if (errors != []) + { + string message = mergestring (errors, "\n\n") + + // last part of message popup + "\n\n" + _("Really use this password?"); + if (!Popup::YesNo (message)) + { + ret = `notnext; + UI::SetFocus (`id (`pw1)); + continue; + } } + // set UID if home directory is found on future home partition password = pw1; } Modified: trunk/users/testsuite/tests/CheckPassword.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/CheckPassw… ============================================================================== --- trunk/users/testsuite/tests/CheckPassword.out (original) +++ trunk/users/testsuite/tests/CheckPassword.out Fri Feb 26 14:48:03 2010 @@ -1,18 +1,18 @@ Execute .crack "qqqqq" "" -Return $["question":"You have used only lowercase letters for the password.\nThis is not a good security practice. Really use this password?", "question_id":"obscure"] +Return ["You have used only lowercase letters for the password."] Execute .crack "QQQQQ" "" -Return $["question":"You have used only uppercase letters for the password.\nThis is not a good security practice. Really use this password?", "question_id":"obscure"] +Return ["You have used only uppercase letters for the password."] Execute .crack "12hh5" "" -Return $["question":"You have used the username as a part of the password.\nThis is not a good security practice. Really use this password?", "question_id":"obscure"] +Return ["You have used the username as a part of the password."] Execute .crack "12345" "" -Return $["question":"You have used only digits for the password.\nThis is not a good security practice. Really use this password?", "question_id":"obscure"] +Return ["You have used only digits for the password."] Execute .crack "aaaQQaaa" "" -Return $["question":"You have used a palindrom for the password.\nThis is not a good security practice. Really use this password?", "question_id":"obscure"] +Return ["You have used a palindrom for the password."] Execute .crack "1a" "" -Return $["question":"The password should have at least 5 characters.\nReally use this shorter password?", "question_id":"short"] +Return ["The password should have at least 5 characters."] Return nil Execute .crack "1aaaaaaaaaaaaaaaaa" "" -Return $["question":"The password is too long for the current encryption method.\nTruncate it to 8 characters?", "question_id":"truncate"] +Return ["The password is too long for the current encryption method.\nIt will be truncated to 8 characters."] Dump -------- password: `!@#$%^&*()-=_+| Return Dump -------- password: [];',./{}:"<> Modified: trunk/users/testsuite/tests/CheckPassword.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/CheckPassw… ============================================================================== --- trunk/users/testsuite/tests/CheckPassword.ycp (original) +++ trunk/users/testsuite/tests/CheckPassword.ycp Fri Feb 26 14:48:03 2010 @@ -21,7 +21,7 @@ "uid" : username, "userPassword" : pw, "type" : "local" - ], $[])), [R,W,E], 0); + ])), [R,W,E], 0); } define void test_contents (string pw) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r61041 - /trunk/users/src/Users.pm
by jsuchome＠svn.opensuse.org 26 Feb '10

26 Feb '10

Author: jsuchome Date: Fri Feb 26 14:05:38 2010 New Revision: 61041 URL: http://svn.opensuse.org/viewcvs/yast?rev=61041&view=rev Log: removed unused functions Modified: trunk/users/src/Users.pm Modified: trunk/users/src/Users.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/Users.pm?rev=61041&r1=… ============================================================================== --- trunk/users/src/Users.pm (original) +++ trunk/users/src/Users.pm Fri Feb 26 14:05:38 2010 @@ -5014,88 +5014,6 @@ return ""; } -##------------------------------------ -# Check the password of current user for the valid characters -# This function is OBSOLETE, use UsersSimple->CheckPassword instead -# return value is error message -BEGIN { $TYPEINFO{CheckPassword} = ["function", "string", "string"]; } -sub CheckPassword { - - my $self = shift; - my $pw = shift; - my $type = UsersCache->GetUserType (); - y2warning ("This function is OBSOLETE, use UsersSimple->CheckPassword"); - return UsersSimple->CheckPassword ($pw, $type); -} - - -##------------------------------------ -# Check the password of given user or group: part 2, checking for -# problems that may be skipped (accepted) by user -# This function is OBSOLETE, it is here just for compatibility reasons, new -# function UsersSimple->CheckPasswordUI has different API) -# @return value is map with the problem found -BEGIN { $TYPEINFO{CheckPasswordUI} = ["function", - ["map", "string", "string"], - "string", "string", ["map", "string", "any"]]; -} -sub CheckPasswordUI { - - my $self = shift; - my $name = $_[0]; - my $pw = $_[1]; - my %ui_map = %{$_[2]}; - my $type = UsersCache->GetUserType (); - my $min_length = $self->GetMinPasswordLength (); - my %ret = (); - - y2warning ("this function is obsolete, use UsersSimple->CheckPasswordUI"); - if ($pw eq "") { - return \%ret; - } - - if (UsersSimple->CrackLibUsed () && (($ui_map{"crack"} || "") ne $pw)) { - my $error = UsersSimple->CrackPassword ($pw); - if ($error ne "") { - $ret{"question_id"} = "crack"; - # popup question - $ret{"question"} = sprintf (__("The password is too simple: -%s -Really use this password?"), $error); - return \%ret; - } - } - - if (UsersSimple->ObscureChecksUsed () && - (($ui_map{"obscure"} || "") ne $pw)) - { - my $error = UsersSimple->CheckObscurity ($name, $pw, UsersCache->GetCurrentSummary ()); - if ($error ne "") { - $ret{"question_id"} = "obscure"; - $ret{"question"} = $error; - return \%ret; - } - } - - if (($ui_map{"short"} || "") ne $pw) { - if (length ($pw) < $min_length) { - $ret{"question_id"} = "short"; - # popup questionm, %i is number - $ret{"question"} = sprintf (__("The password should have at least %i characters. -Really use this shorter password?"), $min_length); - } - } - - if (($ui_map{"truncate"} || "") ne $pw) { - my $error = UsersSimple->CheckPasswordMaxLength ($pw, $type); - if ($error ne "") { - $ret{"question_id"} = "truncate"; - $ret{"question"} = $error; - } - } - return \%ret; -} - ##------------------------------------ # Check if it is possible to write (=create homes) to given directory -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r61040 - in /trunk/squid: package/yast2-squid.changes src/SquidErrorMessages.ycp
by jsrain＠svn.opensuse.org 26 Feb '10

26 Feb '10

Author: jsrain Date: Fri Feb 26 12:47:15 2010 New Revision: 61040 URL: http://svn.opensuse.org/viewcvs/yast?rev=61040&view=rev Log: fixed translations of language names (bnc#580494) Modified: trunk/squid/package/yast2-squid.changes trunk/squid/src/SquidErrorMessages.ycp Modified: trunk/squid/package/yast2-squid.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/package/yast2-squid.change… ============================================================================== --- trunk/squid/package/yast2-squid.changes (original) +++ trunk/squid/package/yast2-squid.changes Fri Feb 26 12:47:15 2010 @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 26 12:28:31 CET 2010 - jsrain(a)suse.cz + +- fixed translations of language names (bnc#580494) + ------------------------------------------------------------------ Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz Modified: trunk/squid/src/SquidErrorMessages.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/SquidErrorMessages.ycp… ============================================================================== --- trunk/squid/src/SquidErrorMessages.ycp (original) +++ trunk/squid/src/SquidErrorMessages.ycp Fri Feb 26 12:47:15 2010 @@ -128,7 +128,7 @@ // language name - combo box entry; don't translate the encoding suffix "Russian-koi8-r" : _("Russian-koi8-r"), // language name - combo box entry - "Simplify_Chinese" : _("Simplified Chinese"), + "Simplify Chinese" : _("Simplified Chinese"), // language name - combo box entry "Swedish" : _("Swedish"), // language name - combo box entry; don't translate the encoding suffix @@ -152,7 +152,7 @@ // language name - combo box entry "Slovak" : _("Slovak"), // language name - combo box entry - "Traditional_Chinese" : _("Traditional Chinese"), + "Traditional Chinese" : _("Traditional Chinese"), // language name - combo box entry; don't translate the encoding suffix "Ukrainian-utf8" : _("Ukrainian-utf8"), ]; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r61039 - in /branches/SuSE-Code-11-SP1-Branch/squid: VERSION package/yast2-squid.changes src/SquidErrorMessages.ycp
by jsrain＠svn.opensuse.org 26 Feb '10

26 Feb '10

Author: jsrain Date: Fri Feb 26 12:45:35 2010 New Revision: 61039 URL: http://svn.opensuse.org/viewcvs/yast?rev=61039&view=rev Log: fixed translations of language names (bnc#580494) Modified: branches/SuSE-Code-11-SP1-Branch/squid/VERSION branches/SuSE-Code-11-SP1-Branch/squid/package/yast2-squid.changes branches/SuSE-Code-11-SP1-Branch/squid/src/SquidErrorMessages.ycp Modified: branches/SuSE-Code-11-SP1-Branch/squid/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/squid… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/squid/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/squid/VERSION Fri Feb 26 12:45:35 2010 @@ -1 +1 @@ -2.17.10 +2.17.11 Modified: branches/SuSE-Code-11-SP1-Branch/squid/package/yast2-squid.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/squid… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/squid/package/yast2-squid.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/squid/package/yast2-squid.changes Fri Feb 26 12:45:35 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 26 12:28:31 CET 2010 - jsrain(a)suse.cz + +- fixed translations of language names (bnc#580494) +- 2.17.11 + +------------------------------------------------------------------- Mon Jan 12 16:52:35 CET 2009 - jsrain(a)suse.de - marked one more missing text for translation (bnc #446808) Modified: branches/SuSE-Code-11-SP1-Branch/squid/src/SquidErrorMessages.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/squid… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/squid/src/SquidErrorMessages.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/squid/src/SquidErrorMessages.ycp Fri Feb 26 12:45:35 2010 @@ -128,7 +128,7 @@ // language name - combo box entry; don't translate the encoding suffix "Russian-koi8-r" : _("Russian-koi8-r"), // language name - combo box entry - "Simplify_Chinese" : _("Simplified Chinese"), + "Simplify Chinese" : _("Simplified Chinese"), // language name - combo box entry "Swedish" : _("Swedish"), // language name - combo box entry; don't translate the encoding suffix @@ -152,7 +152,7 @@ // language name - combo box entry "Slovak" : _("Slovak"), // language name - combo box entry - "Traditional_Chinese" : _("Traditional Chinese"), + "Traditional Chinese" : _("Traditional Chinese"), // language name - combo box entry; don't translate the encoding suffix "Ukrainian-utf8" : _("Ukrainian-utf8"), ]; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0