Hello community,
here is the log from the commit of package yast2-users
checked in at Thu May 24 16:30:46 CEST 2007.
--------
--- yast2-users/yast2-users.changes 2007-05-23 10:05:22.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-users/yast2-users.changes 2007-05-24 16:12:31.863802000 +0200
@@ -1,0 +2,7 @@
+Thu May 24 15:58:42 CEST 2007 - jsuchome@suse.cz
+
+- check for crypted directories modifications before offering
+ 'cryptconfig' installation (#274861)
+- 2.15.28
+
+-------------------------------------------------------------------
Old:
----
yast2-users-2.15.27.tar.bz2
New:
----
yast2-users-2.15.28.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-users.spec ++++++
--- /var/tmp/diff_new_pack.K24766/_old 2007-05-24 16:30:39.000000000 +0200
+++ /var/tmp/diff_new_pack.K24766/_new 2007-05-24 16:30:39.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-users (Version 2.15.27)
+# spec file for package yast2-users (Version 2.15.28)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-users
-Version: 2.15.27
+Version: 2.15.28
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-users-2.15.27.tar.bz2
+Source0: yast2-users-2.15.28.tar.bz2
prefix: /usr
BuildRequires: cracklib-devel doxygen gcc-c++ perl-Digest-SHA1 perl-XML-Writer update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-ldap-client yast2-perl-bindings yast2-security yast2-testsuite
Requires: yast2 yast2-perl-bindings yast2-country yast2-pam yast2-security cracklib perl-Digest-SHA1 perl-X500-DN perl-gettext
@@ -43,7 +43,7 @@
Jiri Suchomel
%prep
-%setup -n yast2-users-2.15.27
+%setup -n yast2-users-2.15.28
%build
%{prefix}/bin/y2tool y2autoconf
@@ -87,6 +87,10 @@
%doc %{prefix}/share/doc/packages/yast2-users
%changelog
+* Thu May 24 2007 - jsuchome@suse.cz
+- check for crypted directories modifications before offering
+ 'cryptconfig' installation (#274861)
+- 2.15.28
* Wed May 23 2007 - jsuchome@suse.cz
- use LDAPInitWithTLSCheck function for init - offer fallback to
unencrypted connection (#246397)
++++++ yast2-users-2.15.27.tar.bz2 -> yast2-users-2.15.28.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.15.27/src/Users.pm new/yast2-users-2.15.28/src/Users.pm
--- old/yast2-users-2.15.27/src/Users.pm 2007-05-23 09:55:13.000000000 +0200
+++ new/yast2-users-2.15.28/src/Users.pm 2007-05-24 16:06:30.000000000 +0200
@@ -3324,8 +3324,8 @@
if (!defined $user{$key} || $user{$key} ne $value)
{
$ret = 1;
- y2debug ("old value: $value, changed to: ",
- $user{$key} || "-" );
+ y2debug ("old value: ", $value || "(not defined)");
+ y2debug ("... changed to: ", $user{$key} || "(not defined)" );
}
}
return $ret;
@@ -3367,6 +3367,29 @@
return $ret;
}
+# take the map of user and check if his crypted directory settings were modified
+# return boolean
+sub CryptedHomeModified {
+
+ my $self = shift;
+ my $user = shift;
+
+ my $username = $user->{"uid"} || "";
+ my $org_username = $user->{"org_user"}{"uid"} || $username;
+ my $home = $user->{"homedirectory"} || "";
+ my $org_home = $user->{"org_user"}{"homedirectory"} || $home;
+ my $home_size = $user->{"crypted_home_size"} || 0;
+ my $org_size = $user->{"org_user"}{"crypted_home_size"} || 0;
+ my $pw = $user->{"current_text_userpassword"};
+ my $new_pw = $user->{"text_userpassword"};
+
+ return 0 if ($home_size == 0 && $org_size == 0); # nothing to do
+ return 0 if ($home eq $org_home && $username eq $org_username && $home_size == $org_size && $pw eq $new_pw);
+ return 0 if !defined $pw; # no change without password provided :-(
+ return 1;
+}
+
+
# Substitute the values of LDAP atributes, predefined in LDAP user configuration
BEGIN { $TYPEINFO{SubstituteUserValues} = ["function", "void"] }
sub SubstituteUserValues {
@@ -4181,7 +4204,7 @@
# only remember for which users we need to call cryptconfig
foreach my $username (keys %{$modified_users{"ldap"}}) {
my %user = %{$modified_users{"ldap"}{$username}};
- if (defined $user{"crypted_home_size"}) {
+ if (defined $user{"crypted_home_size"} && $self->CryptedHomeModified (\%user)) {
$users_with_crypted_dir{$username} = \%user;
}
}
@@ -4380,7 +4403,7 @@
my $gid = $user{"gidnumber"};
my $create_home = $user{"create_home"};
my $skel = $useradd_defaults{"skel"};
- if (defined $user{"crypted_home_size"}) {
+ if (defined $user{"crypted_home_size"} && $self->CryptedHomeModified (\%user)) {
$users_with_crypted_dir{$username} = \%user;
}
if ($user_mod eq "imported" || $user_mod eq "added") {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.15.27/src/UsersRoutines.pm new/yast2-users-2.15.28/src/UsersRoutines.pm
--- old/yast2-users-2.15.27/src/UsersRoutines.pm 2007-05-22 13:23:51.000000000 +0200
+++ new/yast2-users-2.15.28/src/UsersRoutines.pm 2007-05-24 15:24:15.000000000 +0200
@@ -296,10 +296,6 @@
if ($modified eq "added" && !defined $pw) {
$pw = $new_pw;
}
- return 1 if ($home_size == 0 && $org_size == 0); # nothing to do
- return 1 if ($home eq $org_home && $username eq $org_username && $home_size == $org_size && $pw eq $new_pw);
- return 0 if !defined $pw; # no change without password provided :-(
-
# now crypt the home directories
my $tmpdir = Directory->tmpdir ();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.15.27/VERSION new/yast2-users-2.15.28/VERSION
--- old/yast2-users-2.15.27/VERSION 2007-05-23 09:56:38.000000000 +0200
+++ new/yast2-users-2.15.28/VERSION 2007-05-24 16:00:11.000000000 +0200
@@ -1 +1 @@
-2.15.27
+2.15.28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org