Author: jsuchome Date: Thu Nov 10 12:20:04 2011 New Revision: 66784 URL: http://svn.opensuse.org/viewcvs/yast?rev=66784&view=rev Log: - do not recrypt group password provided in autoYaST profile (bnc#722421) - add GID to autoYaST group export map in more cases (backport of bnc#540787) - 2.17.51 Modified: branches/SuSE-Code-11-SP2-Branch/users/VERSION branches/SuSE-Code-11-SP2-Branch/users/package/yast2-users.changes branches/SuSE-Code-11-SP2-Branch/users/src/Users.pm Modified: branches/SuSE-Code-11-SP2-Branch/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/users/VERSION?rev=66784&r1=66783&r2=66784&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/users/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/users/VERSION Thu Nov 10 12:20:04 2011 @@ -1 +1 @@ -2.17.50 +2.17.51 Modified: branches/SuSE-Code-11-SP2-Branch/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/users/package/yast2-users.changes?rev=66784&r1=66783&r2=66784&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/users/package/yast2-users.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/users/package/yast2-users.changes Thu Nov 10 12:20:04 2011 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Thu Nov 10 11:59:58 CET 2011 - jsuchome@suse.cz + +- do not recrypt group password provided in autoYaST profile + (bnc#722421) +- add GID to autoYaST group export map in more cases + (backport of bnc#540787) +- 2.17.51 + +------------------------------------------------------------------- Mon Sep 19 12:57:02 CEST 2011 - jsuchome@suse.cz - use first stage saved data only in second stage (bnc#712900) Modified: branches/SuSE-Code-11-SP2-Branch/users/src/Users.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/users/src/Users.pm?rev=66784&r1=66783&r2=66784&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/users/src/Users.pm (original) +++ branches/SuSE-Code-11-SP2-Branch/users/src/Users.pm Thu Nov 10 12:20:04 2011 @@ -1636,6 +1636,10 @@ undef %user_in_work; $users{$type}{$id} = \%user; } + # do not re-crypt group password value (bnc#722421) + foreach my $id (keys %{$groups{$type}}) { + $groups{$type}{$id}{"encrypted"} = YaST::YCP::Boolean (1); + } } } @@ -5929,8 +5933,22 @@ } } } + my $encrypted = $group{"encrypted"}; + $encrypted = YaST::YCP::Boolean (1) if !defined $encrypted; + if (defined $encrypted && ref ($encrypted) ne "YaST::YCP::Boolean") { + $encrypted = YaST::YCP::Boolean ($encrypted); + } + my $pass = $group{"group_password"}; + if ((!defined $encrypted || !bool ($encrypted)) && + (defined $pass) && !Mode->config ()) + { + $pass = $self->CryptPassword ($pass, $type); + $encrypted = YaST::YCP::Boolean (1); + } + my %ret = ( - "userPassword" => $group{"group_password"}, + "userPassword" => $pass, + "encrypted" => $encrypted, "cn" => $groupname, "gidNumber" => $gid, "userlist" => \%userlist, @@ -6383,7 +6401,7 @@ "groupname" => $group->{"cn"} || "", "userlist" => $userlist ); - if (($group->{"modified"} || "edited") ne "edited" || + if (($group->{"modified"} || "") ne "edited" || (defined $group->{"org_group"} && (defined $group->{"org_group"}{"gidNumber"} && $group->{"gidNumber"} ne $group->{"org_group"}{"gidNumber"}) @@ -6395,6 +6413,12 @@ $ret{"gid"} = $group->{"gidNumber"}; } if (defined $group->{"userPassword"}) { + + my $encrypted = bool ($group->{"encrypted"}); + if (!defined $group->{"encrypted"}) { + $encrypted = 1; + } + $ret{"encrypted"} = YaST::YCP::Boolean ($encrypted); $ret{"group_password"} = $group->{"userPassword"}; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org