Hello community,
here is the log from the commit of package yast2-users
checked in at Mon Oct 13 17:12:49 CEST 2008.
--------
--- yast2-users/yast2-users.changes 2008-10-09 14:26:46.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-users/yast2-users.changes 2008-10-13 16:56:21.166180000 +0200
@@ -1,0 +2,6 @@
+Mon Oct 13 16:06:59 CEST 2008 - jsuchome@suse.cz
+
+- added CLI option 'batchmode': do not ask for data (bnc#431685)
+- 2.17.17
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-users-2.17.16.tar.bz2
New:
----
yast2-users-2.17.17.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-users.spec ++++++
--- /var/tmp/diff_new_pack.P15195/_old 2008-10-13 17:12:29.000000000 +0200
+++ /var/tmp/diff_new_pack.P15195/_new 2008-10-13 17:12:29.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-users (Version 2.17.16)
+# spec file for package yast2-users (Version 2.17.17)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-users
-Version: 2.17.16
+Version: 2.17.17
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-users-2.17.16.tar.bz2
+Source0: yast2-users-2.17.17.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
@@ -52,7 +52,7 @@
Jiri Suchomel
%prep
-%setup -n yast2-users-2.17.16
+%setup -n yast2-users-2.17.17
%build
%{prefix}/bin/y2tool y2autoconf
@@ -94,8 +94,10 @@
%{_libdir}/YaST2/plugin/libpy2ag_crack.so
%{_libdir}/YaST2/plugin/libpy2ag_crack.la
%doc %{prefix}/share/doc/packages/yast2-users
-
%changelog
+* Mon Oct 13 2008 jsuchome@suse.cz
+- added CLI option 'batchmode': do not ask for data (bnc#431685)
+- 2.17.17
* Thu Oct 09 2008 jsuchome@suse.cz
- users.desktop adapted for autoYaST (bnc#430111)
- 2.17.16
++++++ yast2-users-2.17.16.tar.bz2 -> yast2-users-2.17.17.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.17.16/src/cmdline.ycp new/yast2-users-2.17.17/src/cmdline.ycp
--- old/yast2-users-2.17.16/src/cmdline.ycp 2008-07-21 16:08:42.000000000 +0200
+++ new/yast2-users-2.17.17/src/cmdline.ycp 2008-10-13 15:55:15.000000000 +0200
@@ -26,13 +26,14 @@
/**
* set LDAP admin password and read LDAP users and groups
*/
-define boolean bind_and_read_LDAP (string pw) {
+define boolean bind_and_read_LDAP (map options) {
+ string pw = options["ldap_password"]:"";
if (Users::LDAPAvailable() && Users::LDAPNotRead())
{
if (Ldap::bind_pass == nil)
{
- if (pw == "")
+ if (pw == "" && !haskey (options, "batchmode"))
{
// password entering label
pw = CommandLine::PasswordInput (_("LDAP Server Password:"));
@@ -253,7 +254,7 @@
string type = user["type"]:"local";
if (type == "ldap")
{
- if (!bind_and_read_LDAP (options["ldap_password"]:""))
+ if (!bind_and_read_LDAP (options))
return false;
if (!haskey (user,"sn"))
user["sn"] = user["uid"]:"";
@@ -261,7 +262,7 @@
Users::ResetCurrentUser ();
- if (!haskey(user,"userPassword"))
+ if (!haskey(user,"userPassword") && !haskey (user, "batchmode"))
{
string pw = "";
integer i = 0;
@@ -335,7 +336,7 @@
string type = options["type"]:"local";
if (type == "ldap")
{
- if (!bind_and_read_LDAP (options["ldap_password"]:""))
+ if (!bind_and_read_LDAP (options))
return false;
}
if (uid != -1 && uid != nil)
@@ -382,7 +383,7 @@
string type = options["type"]:"local";
if (type == "ldap")
{
- if (!bind_and_read_LDAP (options["ldap_password"]:""))
+ if (!bind_and_read_LDAP (options))
return false;
}
if (uid != -1 && uid != nil)
@@ -554,7 +555,7 @@
string type = options["type"]:"local";
if (type == "ldap")
{
- if (!bind_and_read_LDAP (options["ldap_password"]:""))
+ if (!bind_and_read_LDAP (options))
return false;
}
if (gid != -1 && gid != nil)
@@ -591,7 +592,7 @@
string type = group["type"]:"local";
if (type == "ldap")
{
- if (!bind_and_read_LDAP (options["ldap_password"]:""))
+ if (!bind_and_read_LDAP (options))
return false;
}
string member_attr = (type == "ldap") ? UsersLDAP::GetMemberAttribute () :
@@ -644,7 +645,7 @@
string type = options["type"]:"local";
if (type == "ldap")
{
- if (!bind_and_read_LDAP (options["ldap_password"]:""))
+ if (!bind_and_read_LDAP (options))
return false;
}
if (gid != -1 && gid != nil)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.17.16/src/groups.ycp new/yast2-users-2.17.17/src/groups.ycp
--- old/yast2-users-2.17.16/src/groups.ycp 2008-07-21 14:51:53.000000000 +0200
+++ new/yast2-users-2.17.17/src/groups.ycp 2008-10-13 15:47:38.000000000 +0200
@@ -172,6 +172,10 @@
"help" : _("Password for LDAP server"),
"type" : "string"
],
+ "batchmode" :$[
+ // translators: command line help text for batchmode option
+ "help" : _("Don't ask for missing data; return error instead.")
+ ],
],
"mappings" : $[
"list" : [ "local", "system", "ldap", "nis" ],// + "custom"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.17.16/src/users.ycp new/yast2-users-2.17.17/src/users.ycp
--- old/yast2-users-2.17.16/src/users.ycp 2008-07-21 14:51:53.000000000 +0200
+++ new/yast2-users-2.17.17/src/users.ycp 2008-10-13 15:47:47.000000000 +0200
@@ -194,13 +194,25 @@
"help" : _("New UID of the user"),
"type" : "string"
],
+ "batchmode" :$[
+ // translators: command line help text for batchmode option
+ "help" : _("Don't ask for missing data; return error instead.")
+ ],
],
"mappings" : $[
"list" : [ "local", "system", "ldap", "nis", ],// + "custom"
"show" : [ "uid", "username", "type" ],
- "add" : [ "username", "uid", "cn", "password", "home", "no_home", "shell", "gid", "grouplist", "type", "ldap_password" ],
- "edit" : [ "username", "uid", "cn", "password", "home", "shell", "gid", "grouplist", "new_username", "new_uid", "type", "ldap_password" ],
- "delete": [ "username", "uid", "delete_home", "type", "ldap_password" ],
+ "add" : [ "username", "uid", "cn", "password", "home", "no_home",
+ "shell", "gid", "grouplist", "type", "ldap_password",
+ "batchmode"
+ ],
+ "edit" : [ "username", "uid", "cn", "password", "home", "shell", "gid",
+ "grouplist", "new_username", "new_uid", "type",
+ "ldap_password", "batchmode"
+ ],
+ "delete": [ "username", "uid", "delete_home", "type", "ldap_password",
+ "batchmode"
+ ],
]
];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.17.16/VERSION new/yast2-users-2.17.17/VERSION
--- old/yast2-users-2.17.16/VERSION 2008-10-09 14:25:30.000000000 +0200
+++ new/yast2-users-2.17.17/VERSION 2008-10-13 16:07:26.000000000 +0200
@@ -1 +1 @@
-2.17.16
+2.17.17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org