Author: jsuchome
Date: Tue May 20 10:43:51 2008
New Revision: 47697
URL: http://svn.opensuse.org/viewcvs/yast?rev=47697&view=rev
Log:
- do not allow encrypting directories when pam_thinkfinger is used
(bnc#390810)
- do not crypt already encrypted password when importing users
(bnc#392053)
- ignore first user when imporing existing ones (bnc#392034)
- 2.16.31
Modified:
trunk/users/VERSION
trunk/users/package/yast2-users.changes
trunk/users/src/UsersRoutines.pm
trunk/users/src/UsersSimple.pm
trunk/users/src/dialogs.ycp
trunk/users/src/inst_user.ycp
trunk/users/src/inst_user_first.ycp
Modified: trunk/users/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/VERSION?rev=47697&r1=47696&r2=47697&view=diff
==============================================================================
--- trunk/users/VERSION (original)
+++ trunk/users/VERSION Tue May 20 10:43:51 2008
@@ -1 +1 @@
-2.16.30
+2.16.31
Modified: trunk/users/package/yast2-users.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.changes?rev=47697&r1=47696&r2=47697&view=diff
==============================================================================
--- trunk/users/package/yast2-users.changes (original)
+++ trunk/users/package/yast2-users.changes Tue May 20 10:43:51 2008
@@ -1,4 +1,14 @@
-------------------------------------------------------------------
+Tue May 20 10:34:59 CEST 2008 - jsuchome@suse.cz
+
+- do not allow encrypting directories when pam_thinkfinger is used
+ (bnc#390810)
+- do not crypt already encrypted password when importing users
+ (bnc#392053)
+- ignore first user when imporing existing ones (bnc#392034)
+- 2.16.31
+
+-------------------------------------------------------------------
Fri May 16 16:40:22 CEST 2008 - jsrain@suse.cz
- added categories Settings and System into desktop file
Modified: trunk/users/src/UsersRoutines.pm
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/UsersRoutines.pm?rev=47697&r1=47696&r2=47697&view=diff
==============================================================================
--- trunk/users/src/UsersRoutines.pm (original)
+++ trunk/users/src/UsersRoutines.pm Tue May 20 10:43:51 2008
@@ -16,6 +16,7 @@
##------------------------------------
##------------------- global imports
+YaST::YCP::Import ("Pam");
YaST::YCP::Import ("Report");
YaST::YCP::Import ("SCR");
@@ -31,6 +32,9 @@
# 'volume' information from pam_mount (info about crypted homes)
my $pam_mount = undef;
+# could we use pam_mount? currntly not if thinkfinger is in use (bnc#390810)
+my $crypted_homes_enabled = undef;
+
##-------------------------------------------------------------------------
##----------------- helper routines ---------------------------------------
@@ -552,5 +556,17 @@
}
return "";
}
+
+#
+BEGIN { $TYPEINFO{CryptedHomesEnabled} = ["function", "boolean"];}
+sub CryptedHomesEnabled {
+
+ if (!defined $crypted_homes_enabled) {
+ $crypted_homes_enabled = !Pam->Enabled ("thinkfinger");
+ }
+ return $crypted_homes_enabled;
+}
+
+
1
# EOF
Modified: trunk/users/src/UsersSimple.pm
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/UsersSimple.pm?rev=47697&r1=47696&r2=47697&view=diff
==============================================================================
--- trunk/users/src/UsersSimple.pm (original)
+++ trunk/users/src/UsersSimple.pm Tue May 20 10:43:51 2008
@@ -864,8 +864,10 @@
my $user_defined = 0;
foreach my $user (@users) {
if (defined $user->{"userpassword"}) {
- $user->{"userpassword"} =
- $self->CryptPassword($user->{"userpassword"});
+ if (!defined $user->{"__imported"}) {
+ $user->{"userpassword"} =
+ $self->CryptPassword($user->{"userpassword"});
+ }
$user->{"encrypted"} = YaST::YCP::Integer (1);
}
$user_defined = 1;
Modified: trunk/users/src/dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/dialogs.ycp?rev=47697&r1=47696&r2=47697&view=diff
==============================================================================
--- trunk/users/src/dialogs.ycp (original)
+++ trunk/users/src/dialogs.ycp Tue May 20 10:43:51 2008
@@ -28,6 +28,7 @@
import "UsersCache";
import "UsersLDAP";
import "UsersPlugins";
+import "UsersRoutines";
import "UsersSimple";
import "Wizard";
@@ -224,6 +225,7 @@
boolean no_skel = user["no_skeleton"]:false;
boolean do_not_edit = (user_type == "nis");
boolean crypted_home_enabled=
+ UsersRoutines::CryptedHomesEnabled () &&
((user_type == "ldap" && Ldap::file_server) ||
(user_type == "local" || user_type == "system"));
Modified: trunk/users/src/inst_user.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/inst_user.ycp?rev=47697&r1=47696&r2=47697&view=diff
==============================================================================
--- trunk/users/src/inst_user.ycp (original)
+++ trunk/users/src/inst_user.ycp Tue May 20 10:43:51 2008
@@ -14,6 +14,7 @@
textdomain "users";
import "Autologin";
+ import "Directory";
import "FileUtils";
import "GetInstArgs";
import "Package";
@@ -43,6 +44,10 @@
{
Users::SetUsersForImport (users);
importing = true;
+ string import_dir = Directory::vardir + "/imported/userdata/etc";
+ foreach (string file, [ "/passwd", "/shadow", "/group" ], {
+ SCR::Execute (.target.remove, import_dir + file);
+ });
}
}
// what to call after inst_auth dialog
Modified: trunk/users/src/inst_user_first.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/inst_user_first.ycp?rev=47697&r1=47696&r2=47697&view=diff
==============================================================================
--- trunk/users/src/inst_user_first.ycp (original)
+++ trunk/users/src/inst_user_first.ycp Tue May 20 10:43:51 2008
@@ -625,7 +625,7 @@
map