Author: jsuchome Date: Wed May 9 10:25:11 2012 New Revision: 68102 URL: http://svn.opensuse.org/viewcvs/yast?rev=68102&view=rev Log: - enhanced check for password requirement in Users plugin - 2.22.3 Modified: trunk/samba-server/VERSION trunk/samba-server/package/yast2-samba-server.changes trunk/samba-server/users-plugin/UsersPluginSamba.pm Modified: trunk/samba-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/VERSION?rev=68102&r1=68101&r2=68102&view=diff ============================================================================== --- trunk/samba-server/VERSION (original) +++ trunk/samba-server/VERSION Wed May 9 10:25:11 2012 @@ -1 +1 @@ -2.22.2 +2.22.3 Modified: trunk/samba-server/package/yast2-samba-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/package/yast2-samba-server.changes?rev=68102&r1=68101&r2=68102&view=diff ============================================================================== --- trunk/samba-server/package/yast2-samba-server.changes (original) +++ trunk/samba-server/package/yast2-samba-server.changes Wed May 9 10:25:11 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed May 9 10:19:43 CEST 2012 - jsuchome@suse.cz + +- enhanced check for password requirement in Users plugin +- 2.22.3 + +------------------------------------------------------------------- Thu Mar 29 15:56:35 CEST 2012 - jsuchome@suse.cz - merge proofread texts Modified: trunk/samba-server/users-plugin/UsersPluginSamba.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/users-plugin/UsersPluginSamba.pm?rev=68102&r1=68101&r2=68102&view=diff ============================================================================== --- trunk/samba-server/users-plugin/UsersPluginSamba.pm (original) +++ trunk/samba-server/users-plugin/UsersPluginSamba.pm Wed May 9 10:25:11 2012 @@ -288,7 +288,8 @@ if( ! $data->{'sambainternal'}->{'initialized'} ) { $self->init_internal_keys( $config, $data ); $data->{'sambainternal'}->{'initialized'} = 1; - } elsif ( (! $data->{'sambaLMPassword'}) && + } elsif ( (! $data->{'sambaLMPassword'}) && + (! $data->{'sambaNTPassword'}) && ( (! $data->{'text_userpassword'} ) || ($data->{'text_userpassword'} eq "" )) ){ $error = __("Change the password to create the Samba account"); return undef; @@ -301,7 +302,8 @@ } $self->update_attributes ($config, $data); - if ( (! $data->{'sambaLMPassword'}) ) { + if ( (! $data->{'sambaLMPassword'}) && + (! $data->{'sambaNTPassword'}) ) { y2debug ("no samba password hashes present yet"); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org