Author: jsuchome Date: Tue Jun 12 10:59:26 2007 New Revision: 38402 URL: http://svn.opensuse.org/viewcvs/yast?rev=38402&view=rev Log: - additional warning in case of user name conflict (#228283) - 2.15.30 Modified: trunk/users/VERSION trunk/users/package/yast2-users.changes trunk/users/src/Users.pm Modified: trunk/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/VERSION?rev=38402&r1=38401&r2=38402&view=diff ============================================================================== --- trunk/users/VERSION (original) +++ trunk/users/VERSION Tue Jun 12 10:59:26 2007 @@ -1 +1 @@ -2.15.29 +2.15.30 Modified: trunk/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.changes?rev=38402&r1=38401&r2=38402&view=diff ============================================================================== --- trunk/users/package/yast2-users.changes (original) +++ trunk/users/package/yast2-users.changes Tue Jun 12 10:59:26 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jun 12 10:53:07 CEST 2007 - jsuchome@suse.cz + +- additional warning in case of user name conflict (#228283) +- 2.15.30 + +------------------------------------------------------------------- Mon Jun 11 13:35:12 CEST 2007 - jsuchome@suse.cz - ask for disabling autologin when adding new user (#166228) Modified: trunk/users/src/Users.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/Users.pm?rev=38402&r1=38401&r2=38402&view=diff ============================================================================== --- trunk/users/src/Users.pm (original) +++ trunk/users/src/Users.pm Tue Jun 12 10:59:26 2007 @@ -4798,10 +4798,10 @@ Try again."), $min, $max); } - my $filtered = $username; - + my $filtered = $username; + my $type = $user_in_work{"type"} || ""; # Samba users may need to have '$' at the end of username (#40433) - if (($user_in_work{"type"} || "") eq "ldap") { + if ($type eq "ldap") { $filtered =~ s/\$$//g; } my $grep = SCR->Execute (".target.bash_output", "echo '$filtered' | grep '\^$character_class\$'", { "LANG" => "C" }); @@ -4822,10 +4822,13 @@ $user_in_work{"org_uid"} ne $username)) { if (UsersCache->UsernameExists ($username)) { - # error popup - return __("There is a conflict between the entered -username and an existing username. -Try another one."); + # additional sentence for error popup + my $more = ($type eq "local" || $type eq "system") ? __(" +The existing username might belong to NIS or LDAP user.") : ""; + # error popup, %1 might be additional sentence ("The existing username...") + return sformat (__("There is a conflict between the entered +username and an existing username. %1 +Try another one."), $more); } } return ""; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org