Author: jsuchome
Date: Mon May 24 14:19:10 2010
New Revision: 62056
URL: http://svn.opensuse.org/viewcvs/yast?rev=62056&view=rev
Log:
- UMASK setting moved to /etc/default/useradd (bnc#606249)
- /etc/login.defs no more written
- 2/19.14
Modified:
trunk/users/VERSION
trunk/users/package/yast2-users.changes
trunk/users/src/Users.pm
trunk/users/src/UsersLDAP.pm
trunk/users/src/widgets.ycp
trunk/users/testsuite/tests/AddGroup.out
trunk/users/testsuite/tests/AddUser.out
trunk/users/testsuite/tests/BuildAdditional.out
trunk/users/testsuite/tests/DeleteUser.out
trunk/users/testsuite/tests/EditUser.out
trunk/users/testsuite/tests/EditUsersGroups.out
trunk/users/testsuite/tests/Import.out
trunk/users/testsuite/tests/Read.out
trunk/users/testsuite/tests/SelectUser.out
trunk/users/testsuite/tests/YaPIGroupAdd.out
Modified: trunk/users/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/VERSION?rev=62056&r1=62055&r2=62056&view=diff
==============================================================================
--- trunk/users/VERSION (original)
+++ trunk/users/VERSION Mon May 24 14:19:10 2010
@@ -1 +1 @@
-2.19.13
+2.19.14
Modified: trunk/users/package/yast2-users.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.changes?rev=62056&r1=62055&r2=62056&view=diff
==============================================================================
--- trunk/users/package/yast2-users.changes (original)
+++ trunk/users/package/yast2-users.changes Mon May 24 14:19:10 2010
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Mon May 24 14:02:03 CEST 2010 - jsuchome@suse.cz
+
+- UMASK setting moved to /etc/default/useradd (bnc#606249)
+- /etc/login.defs no more written
+- 2/19.14
+
+-------------------------------------------------------------------
Mon Apr 26 15:14:11 CEST 2010 - jsuchome@suse.cz
- skip root password creation if it was already saved (bnc#599287)
Modified: trunk/users/src/Users.pm
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/Users.pm?rev=62056&r1=62055&r2=62056&view=diff
==============================================================================
--- trunk/users/src/Users.pm (original)
+++ trunk/users/src/Users.pm Mon May 24 14:19:10 2010
@@ -98,6 +98,7 @@
"shell" => "",
"skel" => "",
"groups" => "",
+ "umask" => "022"
);
# which sets of users are available:
@@ -117,7 +118,6 @@
my $customs_modified = 0;
my $defaults_modified = 0;
my $security_modified = 0;
-my $login_defs_modified = 0;
# variables describing available users sets:
my $nis_available = 1;
@@ -152,9 +152,6 @@
# User/group names must match the following regex expression. (/etc/login.defs)
my $character_class = "[[:alpha:]_][[:alnum:]_.-]*[[:alnum:]_.\$-]\\?";
-# Umask which is used for creating new home directories. (/etc/login.defs)
-my $umask = "022";
-
# the +/- entries in config files:
my @pluses_passwd = ();
my @pluses_group = ();
@@ -281,7 +278,6 @@
$ldap_modified ||
$customs_modified ||
$defaults_modified ||
- $login_defs_modified ||
$security_modified;
return $ret;
@@ -429,20 +425,11 @@
# return the global $umask value
BEGIN { $TYPEINFO{GetUmask} = ["function", "string"]; }
sub GetUmask {
+ my $umask = $useradd_defaults{"umask"};
+ $umask = "022" unless $umask;
return $umask;
}
-# set the new value of umask
-BEGIN { $TYPEINFO{SetUmask} = ["function", "void", "string"]; }
-sub SetUmask {
- my $self = shift;
- my $u = shift;
- if (defined ($u) && $u ne "" && $u ne $umask) {
- $umask = $u;
- $login_defs_modified = 1;
- }
-}
-
##------------------------------------
# current users = name of user sets currently shown in table ("local", "nis")
BEGIN { $TYPEINFO{GetCurrentUsers} = ["function", ["list", "string"]]; }
@@ -1336,10 +1323,6 @@
$character_class= SCR->Read (".etc.login_defs.CHARACTER_CLASS");
}
- if (contains ($login_defs, "UMASK")) {
- $umask = SCR->Read (".etc.login_defs.UMASK");
- }
-
my %max_lengths = %{Security->PasswordMaxLengths ()};
if (defined $max_lengths{$encryption_method}) {
my $len = $max_lengths{$encryption_method};
@@ -1348,7 +1331,6 @@
}
UsersCache->InitConstants (\%security);
- UsersLDAP->SetUmask ($umask);
$system_defaults_read = 1;
}
@@ -3975,21 +3957,6 @@
}
##------------------------------------
-# Writes settings to /etc/login.defs
-sub WriteLoginDefs {
-
- my $ret = 1;
-
- $ret = SCR->Write (".etc.login_defs.UMASK", $umask);
- if ($ret) {
- SCR->Write (".etc.login_defs", "force");
- }
- y2milestone ("Succesfully written /etc/login.defs: $ret");
- y2usernote ("File '/etc/login.defs' was modified.");
- return $ret;
-}
-
-##------------------------------------
# Save Security settings (encryption method) if changed in Users module
BEGIN { $TYPEINFO{WriteSecurity} = ["function", "boolean"]; }
sub WriteSecurity {
@@ -4264,6 +4231,8 @@
my @useradd_postcommands = ();
my @groupadd_postcommands = ();
+ my $umask = $self->GetUmask ();
+
# progress caption
my $caption = __("Writing User and Group Configuration");
my $no_of_steps = 8;
@@ -4748,9 +4717,6 @@
$defaults_modified = 0;
}
}
- if ($login_defs_modified && $self->WriteLoginDefs ()) {
- $login_defs_modified = 0;
- }
if ($security_modified) {
WriteSecurity();
@@ -6586,7 +6552,7 @@
sub SetModified {
my $self = shift;
$users_modified = $groups_modified = $customs_modified =
- $defaults_modified = $security_modified = $login_defs_modified = $_[0];
+ $defaults_modified = $security_modified = $_[0];
}
BEGIN { $TYPEINFO{SetExportAll} = ["function", "void", "boolean"];}
Modified: trunk/users/src/UsersLDAP.pm
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/UsersLDAP.pm?rev=62056&r1=62055&r2=62056&view=diff
==============================================================================
--- trunk/users/src/UsersLDAP.pm (original)
+++ trunk/users/src/UsersLDAP.pm Mon May 24 14:19:10 2010
@@ -107,8 +107,6 @@
my $min_pass_length = 5;
my $max_pass_length = 8;
-# Umask which is used for creating new home directories. (/etc/login.defs)
-my $umask = "022";
# keys in user's map which are not saved anywhere, they are used for internal
# purposes only
@@ -626,16 +624,6 @@
}
}
-##------------------------------------
-BEGIN { $TYPEINFO{SetUmask} = ["function", "void", "string"];}
-sub SetUmask {
-
- my $self = shift;
- my $u = shift;
- if (defined ($u) && $u ne "") {
- $umask = $u;
- }
-}
##------------------------------------
BEGIN { $TYPEINFO{GetDefaultShadow} = ["function",
@@ -1272,6 +1260,8 @@
my $dn_attr = $user_naming_attr;
my $last_id = $last_uid;
my $users = $_[0];
+ my $umask = $useradd_defaults{"umask"};
+ $umask = "022" unless $umask;
# if ldap home directiories are on this machine
my $server = Ldap->file_server ();
Modified: trunk/users/src/widgets.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/widgets.ycp?rev=62056&r1=62055&r2=62056&view=diff
==============================================================================
--- trunk/users/src/widgets.ycp (original)
+++ trunk/users/src/widgets.ycp Mon May 24 14:19:10 2010
@@ -1336,7 +1336,7 @@
exp_date = deletechars (out["stdout"]:"", "\n");
}
UI::ChangeWidget (`id ("expire"), `Value, exp_date);
- UI::ChangeWidget (`id ("umask"), `Value, Users::GetUmask ());
+ UI::ChangeWidget (`id ("umask"), `Value, defaults["umask"]:"");
UI::ChangeWidget (`id ("umask"), `InputMaxLength, 3);
}
@@ -1348,7 +1348,7 @@
map defaults = Users::GetLoginDefaults ();
map