Author: jsuchome Date: Thu Mar 11 11:00:23 2010 New Revision: 61252 URL: http://svn.opensuse.org/viewcvs/yast?rev=61252&view=rev Log: - YaPI enhanced to return default values - 2.17.38 Modified: branches/SuSE-Code-11-SP1-Branch/users/VERSION branches/SuSE-Code-11-SP1-Branch/users/package/yast2-users.changes branches/SuSE-Code-11-SP1-Branch/users/src/YaPI/USERS.pm Modified: branches/SuSE-Code-11-SP1-Branch/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/users/VERSION?rev=61252&r1=61251&r2=61252&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/users/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/users/VERSION Thu Mar 11 11:00:23 2010 @@ -1 +1 @@ -2.17.37 +2.17.38 Modified: branches/SuSE-Code-11-SP1-Branch/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/users/package/yast2-users.changes?rev=61252&r1=61251&r2=61252&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/users/package/yast2-users.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/users/package/yast2-users.changes Thu Mar 11 11:00:23 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Mar 11 10:54:50 CET 2010 - jsuchome@suse.cz + +- YaPI enhanced to return default values +- 2.17.38 + +------------------------------------------------------------------- Wed Mar 10 15:11:05 CET 2010 - jsuchome@suse.cz - YaPI: allow to specify default group by name (bnc#582254) Modified: branches/SuSE-Code-11-SP1-Branch/users/src/YaPI/USERS.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/users/src/YaPI/USERS.pm?rev=61252&r1=61251&r2=61252&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/users/src/YaPI/USERS.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/users/src/YaPI/USERS.pm Thu Mar 11 11:00:23 2010 @@ -111,6 +111,8 @@ # ------------------- imported modules YaST::YCP::Import ("Ldap"); YaST::YCP::Import ("Users"); +YaST::YCP::Import ("UsersCache"); +YaST::YCP::Import ("UsersPasswd"); YaST::YCP::Import ("UsersLDAP"); # ------------------------------------- @@ -2486,4 +2488,51 @@ return $ret; } +# Read various default values. The argument map defines what should be returned +# in the return map +BEGIN{$TYPEINFO{Read} = ["function", + [ "map", "string", "any" ], + [ "map", "string", "any" ]]; +} +sub Read { + + my $self = shift; + my $args = shift; + my $ret = {}; + + Users->SetGUI (0); + + my $user_type = $args->{"user_type"} || "local"; + + if ($args->{"login_defaults"} || 0) { + Users->ReadLoginDefaults (); + $ret->{"login_defaults"} = Users->GetLoginDefaults (); + } + # return password length limitation for given user ('local' by default) + if ($args->{"password_length"} || 0) { + Users->ReadSystemDefaults (1); + $ret->{"pw_min"} = Users->GetMinPasswordLength ($user_type); + $ret->{"pw_max"} = Users->GetMaxPasswordLength ($user_type); + } + + if ($args->{"uid_limits"} || 0) { + Users->ReadSystemDefaults (0); + my %configuration = ( + "max_system_uid" => UsersCache->GetMaxUID ("system"), + "max_system_gid" => UsersCache->GetMaxGID ("system") + ); + UsersPasswd->Read (\%configuration); # for filling last UID... + + UsersCache->SetLastUID (UsersPasswd->GetLastUID ($user_type), $user_type); + $ret->{"uid_min"} = UsersCache->GetMinUID ($user_type); + $ret->{"uid_max"} = UsersCache->GetMaxUID ($user_type); + $ret->{"uid_next"} = UsersCache->NextFreeUID (); + } + if ($args->{"all_shells"} || 0) { + Users->ReadAllShells (); + $ret->{"all_shells"} = Users->AllShells (); + } + return $ret; +} + 42; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org