Hello community,
here is the log from the commit of package yast2-users
checked in at Thu Mar 27 23:59:47 CET 2008.
--------
--- yast2-users/yast2-users.changes 2008-03-19 16:12:34.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-users/yast2-users.changes 2008-03-26 16:33:01.866459000 +0100
@@ -1,0 +2,10 @@
+Wed Mar 26 10:51:12 CET 2008 - jsuchome@suse.cz
+
+- installation proposal: show full name and encryption method
+- installation dialogs: check for default values of autologin
+ and "root password = user password" options
+- use new ag_anyxml for reading pam_mount.conf.xml (bnc#366867)
+- use OK button label instead of Accept (fate#120373)
+- 2.16.20
+
+-------------------------------------------------------------------
Old:
----
yast2-users-2.16.19.tar.bz2
New:
----
yast2-users-2.16.20.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-users.spec ++++++
--- /var/tmp/diff_new_pack.Mm5841/_old 2008-03-27 23:44:11.000000000 +0100
+++ /var/tmp/diff_new_pack.Mm5841/_new 2008-03-27 23:44:11.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-users (Version 2.16.19)
+# spec file for package yast2-users (Version 2.16.20)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2-users
-Version: 2.16.19
+Version: 2.16.20
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-users-2.16.19.tar.bz2
+Source0: yast2-users-2.16.20.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-perl-bindings yast2-country yast2-pam yast2-security cracklib perl-Digest-SHA1 perl-X500-DN perl-gettext
@@ -25,8 +25,8 @@
Provides: yast2-config-users y2c_users yast2-trans-users y2t_users yast2-trans-inst-user yast2-trans-users y2t_inst-user
# LDAPInitWithTLSCheck
Requires: yast2-ldap-client >= 2.15.8
-# ProductControl::EnableModule
-Requires: yast2 >= 2.16.30
+# new ag_anyxml
+Requires: yast2 >= 2.16.40
Summary: YaST2 - User and Group Configuration
%description
@@ -46,7 +46,7 @@
Jiri Suchomel
%prep
-%setup -n yast2-users-2.16.19
+%setup -n yast2-users-2.16.20
%build
%{prefix}/bin/y2tool y2autoconf
@@ -89,6 +89,13 @@
%{_libdir}/YaST2/plugin/libpy2ag_crack.la
%doc %{prefix}/share/doc/packages/yast2-users
%changelog
+* Wed Mar 26 2008 jsuchome@suse.cz
+- installation proposal: show full name and encryption method
+- installation dialogs: check for default values of autologin
+ and "root password = user password" options
+- use new ag_anyxml for reading pam_mount.conf.xml (bnc#366867)
+- use OK button label instead of Accept (fate#120373)
+- 2.16.20
* Wed Mar 19 2008 jsuchome@suse.cz
- read /etc/login.defs before writing it (bnc#369287)
- 2.16.19
++++++ yast2-users-2.16.19.tar.bz2 -> yast2-users-2.16.20.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.16.19/src/dialogs.ycp new/yast2-users-2.16.20/src/dialogs.ycp
--- old/yast2-users-2.16.19/src/dialogs.ycp 2008-03-05 15:52:46.000000000 +0100
+++ new/yast2-users-2.16.20/src/dialogs.ycp 2008-03-26 10:56:18.000000000 +0100
@@ -5,7 +5,7 @@
* Authors: Johannes Buchhold ,
* Jiri Suchomel
*
- * $Id: dialogs.ycp 45217 2008-03-05 14:52:46Z jsuchome $
+ * $Id: dialogs.ycp 45728 2008-03-26 09:56:17Z jsuchome $
*/
{
@@ -770,7 +770,7 @@
dialog_contents,
EditUserDialogHelp (complex_layout, user_type, what),
Label::CancelButton(),
- Label::AcceptButton()
+ Label::OKButton()
);
Wizard::HideAbortButton ();
}
@@ -1899,7 +1899,7 @@
dialog_labels [ what, group_type ]:"",
dialog_contents,
EditGroupDialogHelp (more),
- Label::CancelButton(), Label::AcceptButton());
+ Label::CancelButton(), Label::OKButton());
Wizard::HideAbortButton ();
symbol ret = `edit;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.16.19/src/inst_root.ycp new/yast2-users-2.16.20/src/inst_root.ycp
--- old/yast2-users-2.16.19/src/inst_root.ycp 2008-03-19 15:31:30.000000000 +0100
+++ new/yast2-users-2.16.20/src/inst_root.ycp 2008-03-19 16:12:44.000000000 +0100
@@ -14,7 +14,7 @@
*
* Authors: Klaus K�mpf
*
- * $Id: inst_root.ycp 45217 2008-03-05 14:52:46Z jsuchome $
+ * $Id: inst_root.ycp 45615 2008-03-19 15:12:44Z jsuchome $
*/
{
textdomain "users";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.16.19/src/inst_user_first.ycp new/yast2-users-2.16.20/src/inst_user_first.ycp
--- old/yast2-users-2.16.19/src/inst_user_first.ycp 2008-03-19 14:27:18.000000000 +0100
+++ new/yast2-users-2.16.20/src/inst_user_first.ycp 2008-03-26 12:07:14.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Dialog for creating the first user during installation
* Authors: Jiri Suchomel
*
- * $Id: inst_user_first.ycp 45586 2008-03-19 08:02:05Z jsuchome $
+ * $Id: inst_user_first.ycp 45742 2008-03-26 11:07:14Z jsuchome $
*/
{
import "Arch";
@@ -15,6 +15,7 @@
import "Popup";
import "Stage";
import "Package";
+ import "ProductFeatures";
import "Progress";
import "Report";
import "String";
@@ -28,6 +29,13 @@
string arch = Arch::architecture ();
+ boolean check_CA_constraints =
+ ProductFeatures::GetBooleanFeature ("globals","root_password_ca_check");
+
+ // minimal pw length for CA-management (F#300438)
+ integer pw_min_CA = 4;
+
+
// helper function to se package for installation, together with
// architecture dependent version
void install_package (string package) {
@@ -193,8 +201,15 @@
UsersSimple::GetMaxPasswordLength ("local")
) +
- UsersSimple::ValidPasswordHelptext () +
+ UsersSimple::ValidPasswordHelptext ();
+
+ if (check_CA_constraints)
+ help = help + sformat (
+// additional help text about password
+_("<p>If you intend to use this password for creating certificates,
+it has to be at least %1 characters long.</p>"), pw_min_CA);
+ help = help +
// help text for main add user dialog
_("<p>
To ensure that the password was entered correctly,
@@ -336,6 +351,23 @@
string cn = user["cn"]:"";
string password = (string)user["userpassword"]:nil;
+ boolean autologin = UsersSimple::AutologinUsed ();
+ // set the initial default value for autologin
+ if (user == $[] && !autologin)
+ {
+ if (ProductFeatures::GetBooleanFeature ("globals", "enable_autologin"))
+ autologin = true;
+ y2debug ("autologin default value: %1", autologin);
+ }
+ boolean root_pw = (UsersSimple::GetRootPassword () == password);
+ // set the initial default value for root pw checkbox
+ if (user == $[] && !root_pw)
+ {
+ if (ProductFeatures::GetBooleanFeature ("globals", "root_password_as_first_user"))
+ root_pw = true;
+ y2debug ("root_pw default value: %1", root_pw);
+ }
+
// this user gets root's mail
boolean root_mail =
(username != "" && UsersSimple::GetRootAlias () == username);
@@ -356,17 +388,14 @@
term optionbox = `VBox (
`Left (`CheckBox (`id (`root_pw),
// checkbox label
- _("U&se this password for system administrator"),
- UsersSimple::GetRootPassword () == password)
+ _("U&se this password for system administrator"), root_pw)
),
`Left (
// checkbox label
`CheckBox (`id (`root_mail), _("Receive S&ystem Mail"), root_mail)
),
// checkbox label
- `Left (`CheckBox (`id (`autologin),_("&Automatic Login"),
- UsersSimple::AutologinUsed ())
- )
+ `Left (`CheckBox (`id (`autologin), _("&Automatic Login"), autologin))
);
term contents = `HBox (
`HCenter (`HSquash (`VBox (
@@ -480,6 +509,7 @@
// --------------------------------- password checks
string pw1 = (string) UI::QueryWidget(`id(`pw1), `Value);
string pw2 = (string) UI::QueryWidget(`id(`pw2),`Value);
+ root_pw = (boolean) UI::QueryWidget (`id (`root_pw),`Value);
if (pw1 != pw2)
{
@@ -500,6 +530,24 @@
continue;
}
boolean failed = false;
+ if (root_pw && check_CA_constraints && size (pw1) < pw_min_CA)
+ {
+ if (Popup::YesNo (sformat (
+// yes/no popup question, %1 is a number
+_("If you intend to create certificates,
+the password should have at least %1 characters.
+Really use this shorter password?"), pw_min_CA)))
+ {
+ // skip other checks for short passwords
+ ui_map["short"] = 1;
+ }
+ else
+ {
+ ret = `notnext;
+ UI::SetFocus (`id (`pw1));
+ continue;
+ }
+ }
do
{
error_map = UsersSimple::CheckPasswordUI ($[
@@ -540,7 +588,6 @@
"cn" : cn
];
UsersSimple::SetUser (user_map);
- boolean root_pw = (boolean) UI::QueryWidget (`id (`root_pw),`Value);
UsersSimple::SkipRootPasswordDialog (root_pw);
UsersSimple::SetRootPassword (root_pw ? password : "");
UsersSimple::SetAutologinUser (
@@ -554,7 +601,7 @@
else if (auth_method != "users")
{
// preselect the required packages for installation
- y2internal ("preselect required packages for installation");
+ y2milestone ("preselect required packages for installation");
map required_packages = $[
"ldap" : [ "yast2-ldap-client", "pam_ldap", "nss_ldap"],
"nis" : [ "yast2-nis-client", "ypbind" ],
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.16.19/src/inst_user.ycp new/yast2-users-2.16.20/src/inst_user.ycp
--- old/yast2-users-2.16.19/src/inst_user.ycp 2008-03-19 14:47:12.000000000 +0100
+++ new/yast2-users-2.16.20/src/inst_user.ycp 2008-03-19 16:12:44.000000000 +0100
@@ -6,7 +6,7 @@
*
* Purpose: Start user management module from within installation workflow
*
- * $Id: inst_user.ycp 45217 2008-03-05 14:52:46Z jsuchome $
+ * $Id: inst_user.ycp 45615 2008-03-19 15:12:44Z jsuchome $
*/
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.16.19/src/users_plugin_ldap_all.ycp new/yast2-users-2.16.20/src/users_plugin_ldap_all.ycp
--- old/yast2-users-2.16.19/src/users_plugin_ldap_all.ycp 2007-07-11 13:28:18.000000000 +0200
+++ new/yast2-users-2.16.20/src/users_plugin_ldap_all.ycp 2008-03-26 10:56:18.000000000 +0100
@@ -12,7 +12,7 @@
* Authors:
* Jiri Suchomel
*
- * $Id: users_plugin_ldap_all.ycp 39319 2007-07-11 11:28:17Z jsuchome $
+ * $Id: users_plugin_ldap_all.ycp 45728 2008-03-26 09:56:17Z jsuchome $
*/
@@ -188,7 +188,7 @@
// dialog caption
Wizard::SetContentsButtons(_("Additional LDAP Settings"),
- contents, help_text, Label::CancelButton(), Label::AcceptButton());
+ contents, help_text, Label::CancelButton(), Label::OKButton());
Wizard::HideAbortButton ();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.16.19/src/users_plugin_ldap_passwordpolicy.ycp new/yast2-users-2.16.20/src/users_plugin_ldap_passwordpolicy.ycp
--- old/yast2-users-2.16.19/src/users_plugin_ldap_passwordpolicy.ycp 2007-07-11 13:28:18.000000000 +0200
+++ new/yast2-users-2.16.20/src/users_plugin_ldap_passwordpolicy.ycp 2008-03-26 10:56:18.000000000 +0100
@@ -12,7 +12,7 @@
* Authors:
* Jiri Suchomel
*
- * $Id: users_plugin_ldap_passwordpolicy.ycp 39319 2007-07-11 11:28:17Z jsuchome $
+ * $Id: users_plugin_ldap_passwordpolicy.ycp 45728 2008-03-26 09:56:17Z jsuchome $
*/
@@ -87,7 +87,7 @@
// dialog caption
Wizard::SetContentsButtons(_("Password Policy Settings"),
- contents, help_text, Label::CancelButton(), Label::AcceptButton());
+ contents, help_text, Label::CancelButton(), Label::OKButton());
Wizard::HideAbortButton ();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.16.19/src/users_plugin_ldap_shadowaccount.ycp new/yast2-users-2.16.20/src/users_plugin_ldap_shadowaccount.ycp
--- old/yast2-users-2.16.19/src/users_plugin_ldap_shadowaccount.ycp 2007-07-11 13:28:18.000000000 +0200
+++ new/yast2-users-2.16.20/src/users_plugin_ldap_shadowaccount.ycp 2008-03-26 10:56:18.000000000 +0100
@@ -12,7 +12,7 @@
* Authors:
* Jiri Suchomel
*
- * $Id: users_plugin_ldap_shadowaccount.ycp 39319 2007-07-11 11:28:17Z jsuchome $
+ * $Id: users_plugin_ldap_shadowaccount.ycp 45728 2008-03-26 09:56:17Z jsuchome $
*/
@@ -136,7 +136,7 @@
// dialog caption
Wizard::SetContentsButtons (_("Shadow Account Settings"),
contents, EditUserPasswordDialogHelp (),
- Label::CancelButton(), Label::AcceptButton());
+ Label::CancelButton(), Label::OKButton());
Wizard::HideAbortButton ();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.16.19/src/users_plugin_quota.ycp new/yast2-users-2.16.20/src/users_plugin_quota.ycp
--- old/yast2-users-2.16.19/src/users_plugin_quota.ycp 2007-12-03 15:35:56.000000000 +0100
+++ new/yast2-users-2.16.20/src/users_plugin_quota.ycp 2008-03-26 10:56:18.000000000 +0100
@@ -12,7 +12,7 @@
* Authors:
* Jiri Suchomel
*
- * $Id: users_plugin_quota.ycp 42609 2007-12-03 14:35:56Z jsuchome $
+ * $Id: users_plugin_quota.ycp 45728 2008-03-26 09:56:17Z jsuchome $
*/
{
textdomain "users";
@@ -234,7 +234,7 @@
Wizard::SetContentsButtons(
UsersPluginQuota::Name (config, $[]), contents, help_text,
- Label::CancelButton(), Label::AcceptButton()
+ Label::CancelButton(), Label::OKButton()
);
Wizard::HideAbortButton ();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.16.19/src/users_proposal.ycp new/yast2-users-2.16.20/src/users_proposal.ycp
--- old/yast2-users-2.16.19/src/users_proposal.ycp 2008-03-19 09:02:05.000000000 +0100
+++ new/yast2-users-2.16.20/src/users_proposal.ycp 2008-03-26 10:56:39.000000000 +0100
@@ -3,7 +3,7 @@
* Author: Jiri Suchomel
* Purpose: Proposal for user and root setting
*
- * $Id: users_proposal.ycp 45586 2008-03-19 08:02:05Z jsuchome $
+ * $Id: users_proposal.ycp 45729 2008-03-26 09:56:39Z jsuchome $
*/
{
textdomain "users";
@@ -27,6 +27,16 @@
"edir_ldap": _("eDirectory LDAP"),
];
+ map encoding2label = $[
+ // encryption type
+ "des" : _("DES"),
+ // encryption type
+ "md5" : _("MD5"),
+ // encryption type
+ "blowfish" : _("Blowfish"),
+ ];
+
+
if ( func == "MakeProposal" )
{
boolean force_reset = param["force_reset" ]:false;
@@ -58,12 +68,24 @@
else if (user["uid"]:"" != "")
{
// summary line: <%1>-<%2> are HTML tags, leave untouched,
- // %3 is user name
+ // %3 is login name
prop = sformat (_("<%1>User<%2> %3 configured"),
ahref, "/a", user["uid"]:"");
+ if (user["cn"]:"" != "")
+ // summary line: <%1>-<%2> are HTML tags, leave untouched,
+ // %3 is full name, %4 login name
+ prop = sformat (_("<%1>User<%2> %3 (%4) configured"),
+ ahref, "/a", user["cn"]:"", user["uid"]:"");
+ }
+ string rest = "";
+ if (UsersSimple::EncryptionMethod () != "blowfish")
+ {
+ // summary line
+ rest = sformat (_("Password Encrypttion Method: %1"),
+ encoding2label[UsersSimple::EncryptionMethod ()]:"");
}
ret = $[
- "preformatted_proposal" : HTML::List ([ prop, root_proposal ]),
+ "preformatted_proposal" : HTML::List ([ prop, root_proposal, rest]),
"language_changed" : false,
"links" : [ "users--user", "users--root" ],
];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.16.19/src/UsersRoutines.pm new/yast2-users-2.16.20/src/UsersRoutines.pm
--- old/yast2-users-2.16.19/src/UsersRoutines.pm 2008-03-05 12:59:10.000000000 +0100
+++ new/yast2-users-2.16.20/src/UsersRoutines.pm 2008-03-25 13:06:51.000000000 +0100
@@ -501,16 +501,12 @@
if (FileUtils->Exists ($pam_mount_path)) {
my $pam_mount_cont = SCR->Read (".anyxml", $pam_mount_path);
if (defined $pam_mount_cont &&
- defined $pam_mount_cont->{"pam_mount"}{"volume"})
+ defined $pam_mount_cont->{"pam_mount"}[0]{"volume"})
{
- my $volumes = $pam_mount_cont->{"pam_mount"}{"volume"};
- if (ref ($volumes) eq "HASH") {
- my $username = $volumes->{"user"}{"value"};
- $pam_mount->{$username} = $volumes if defined $username;
- }
- elsif (ref ($volumes) eq "ARRAY") {
+ my $volumes = $pam_mount_cont->{"pam_mount"}[0]{"volume"};
+ if (ref ($volumes) eq "ARRAY") {
foreach my $usermap (@{$volumes}) {
- my $username = $usermap->{"user"}{"value"};
+ my $username = $usermap->{"user"};
next if !defined $username;
$pam_mount->{$username} = $usermap;
}
@@ -536,7 +532,7 @@
my $user = shift;
if ($self->ReadCryptedHomesInfo ()) {
- return $pam_mount->{$user}{"path"}{"value"} || "";
+ return $pam_mount->{$user}{"path"} || "";
}
return "";
}
@@ -552,7 +548,7 @@
my $user = shift;
if ($self->ReadCryptedHomesInfo ()) {
- return $pam_mount->{$user}{"fskeypath"}{"value"} || "";
+ return $pam_mount->{$user}{"fskeypath"} || "";
}
return "";
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.16.19/src/UsersSimple.pm new/yast2-users-2.16.20/src/UsersSimple.pm
--- old/yast2-users-2.16.19/src/UsersSimple.pm 2008-03-19 10:51:35.000000000 +0100
+++ new/yast2-users-2.16.20/src/UsersSimple.pm 2008-03-25 15:47:55.000000000 +0100
@@ -249,7 +249,6 @@
BEGIN { $TYPEINFO{AutologinUsed} = ["function", "boolean"]; }
sub AutologinUsed {
return bool ($autologin_user ne "");
-# FIXME true for the first time...
}
BEGIN { $TYPEINFO{SetAutologinUser} = ["function", "void", "string"]; }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.16.19/VERSION new/yast2-users-2.16.20/VERSION
--- old/yast2-users-2.16.19/VERSION 2008-03-19 15:58:52.000000000 +0100
+++ new/yast2-users-2.16.20/VERSION 2008-03-26 10:53:17.000000000 +0100
@@ -1 +1 @@
-2.16.19
+2.16.20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org