Author: jsuchome Date: Wed Feb 27 10:02:11 2008 New Revision: 45057 URL: http://svn.opensuse.org/viewcvs/yast?rev=45057&view=rev Log: - fixed enabling LDAP users with password policy (bnc#364837) - 2.16.13 Modified: trunk/users/VERSION trunk/users/package/yast2-users.changes trunk/users/src/UsersPluginLDAPPasswordPolicy.pm Modified: trunk/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/VERSION?rev=45057&r1=45056&r2=45057&view=diff ============================================================================== --- trunk/users/VERSION (original) +++ trunk/users/VERSION Wed Feb 27 10:02:11 2008 @@ -1 +1 @@ -2.16.12 +2.16.13 Modified: trunk/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.changes?rev=45057&r1=45056&r2=45057&view=diff ============================================================================== --- trunk/users/package/yast2-users.changes (original) +++ trunk/users/package/yast2-users.changes Wed Feb 27 10:02:11 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Feb 27 09:52:03 CET 2008 - jsuchome@suse.cz + +- fixed enabling LDAP users with password policy (bnc#364837) +- 2.16.13 + +------------------------------------------------------------------- Mon Feb 25 16:12:45 CET 2008 - jsuchome@suse.cz - proposing of username uses same method on installed system Modified: trunk/users/src/UsersPluginLDAPPasswordPolicy.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/UsersPluginLDAPPasswordPolicy.pm?rev=45057&r1=45056&r2=45057&view=diff ============================================================================== --- trunk/users/src/UsersPluginLDAPPasswordPolicy.pm (original) +++ trunk/users/src/UsersPluginLDAPPasswordPolicy.pm Wed Feb 27 10:02:11 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; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org