Author: jsuchome Date: Fri Feb 29 13:49:39 2008 New Revision: 45124 URL: http://svn.opensuse.org/viewcvs/yast?rev=45124&view=rev Log: - fixed enabling LDAP users with password policy (bnc#364837) - fixed removing LDAP Shadow Account plugin (bnc#364833) - 2.13.60 Modified: branches/SuSE-SLE-10-SP2-Branch/users/VERSION branches/SuSE-SLE-10-SP2-Branch/users/package/yast2-users.changes branches/SuSE-SLE-10-SP2-Branch/users/src/UsersPluginLDAPPasswordPolicy.pm branches/SuSE-SLE-10-SP2-Branch/users/src/UsersPluginLDAPShadowAccount.pm Modified: branches/SuSE-SLE-10-SP2-Branch/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/users/VERSION?rev=45124&r1=45123&r2=45124&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/users/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/users/VERSION Fri Feb 29 13:49:39 2008 @@ -1 +1 @@ -2.13.59 +2.13.60 Modified: branches/SuSE-SLE-10-SP2-Branch/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/users/package/yast2-users.changes?rev=45124&r1=45123&r2=45124&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/users/package/yast2-users.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/users/package/yast2-users.changes Fri Feb 29 13:49:39 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Feb 29 13:41:46 CET 2008 - jsuchome@suse.cz + +- fixed enabling LDAP users with password policy (bnc#364837) +- fixed removing LDAP Shadow Account plugin (bnc#364833) +- 2.13.60 + +------------------------------------------------------------------- Fri Feb 15 10:07:18 CET 2008 - jsuchome@suse.cz - remove LDAP entries from custom settings if LDAP is not present Modified: branches/SuSE-SLE-10-SP2-Branch/users/src/UsersPluginLDAPPasswordPolicy.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/users/src/UsersPluginLDAPPasswordPolicy.pm?rev=45124&r1=45123&r2=45124&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/users/src/UsersPluginLDAPPasswordPolicy.pm (original) +++ branches/SuSE-SLE-10-SP2-Branch/users/src/UsersPluginLDAPPasswordPolicy.pm Fri Feb 29 13:49:39 2008 @@ -41,6 +41,11 @@ # if Password Policy is enabled on the server my $ppolicy_enabled = undef; + +# value to write into pwdaccountlockedtime if user should be disabled +# see slapo-ppolicy man-page +my $disabled_user = "000001010000Z"; + ##---------------------------------------- ##--------------------- internal functions @@ -260,7 +265,7 @@ my ($self, $config, $data) = @_; y2debug ("Disable LDAPAll called"); - $data->{'pwdaccountlockedtime'} = "000001010000Z"; # see slapo-ppolicy man-page + $data->{'pwdaccountlockedtime'} = $disabled_user; return $data; } @@ -324,6 +329,13 @@ "); return undef; } + if (!defined $config->{"org_data"}{"enabled"}) { + $data->{"enabled"} = YaST::YCP::Boolean (1); + if (($config->{"org_data"}{"pwdaccountlockedtime"} || "") eq $disabled_user) { + $data->{"enabled"} = YaST::YCP::Boolean (0); + y2milestone ("user is disabled"); + } + } return $data; } Modified: branches/SuSE-SLE-10-SP2-Branch/users/src/UsersPluginLDAPShadowAccount.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/users/src/UsersPluginLDAPShadowAccount.pm?rev=45124&r1=45123&r2=45124&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/users/src/UsersPluginLDAPShadowAccount.pm (original) +++ branches/SuSE-SLE-10-SP2-Branch/users/src/UsersPluginLDAPShadowAccount.pm Fri Feb 29 13:49:39 2008 @@ -109,6 +109,11 @@ } } $data->{'objectclass'} = \@updated_oc; + foreach my $attr ("shadowinactive", "shadowexpire", "shadowlastchange", + "shadowmin", "shadowmax", "shadowwarning", "shadowflag") + { + $data->{$attr} = ""; + } return $data; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org