Hello community,
here is the log from the commit of package yast2-ldap-client
checked in at Tue Feb 20 00:39:52 CET 2007.
--------
--- yast2-ldap-client/yast2-ldap-client.changes 2007-02-13 07:53:20.000000000 +0100
+++ yast2-ldap-client/yast2-ldap-client.changes 2007-02-19 15:13:12.196555000 +0100
@@ -1,0 +2,8 @@
+Mon Feb 19 14:51:47 CET 2007 - jsuchome@suse.cz
+
+- added login_enabled to Set/Export functions (#246235)
+- added Ldap::WriteNow for Write without abort block (#246237)
+- make 'createconfig' command line option non-mandatory
+- 2.15.4
+
+-------------------------------------------------------------------
Old:
----
yast2-ldap-client-2.15.3.tar.bz2
New:
----
yast2-ldap-client-2.15.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ldap-client.spec ++++++
--- /var/tmp/diff_new_pack.I17656/_old 2007-02-20 00:38:19.000000000 +0100
+++ /var/tmp/diff_new_pack.I17656/_new 2007-02-20 00:38:19.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-ldap-client (Version 2.15.3)
+# spec file for package yast2-ldap-client (Version 2.15.4)
#
# 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-ldap-client
-Version: 2.15.3
+Version: 2.15.4
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ldap-client-2.15.3.tar.bz2
+Source0: yast2-ldap-client-2.15.4.tar.bz2
prefix: /usr
BuildRequires: doxygen perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-network yast2-pam yast2-testsuite
PreReq: %fillup_prereq
@@ -42,7 +42,7 @@
Jiri Suchomel
%prep
-%setup -n yast2-ldap-client-2.15.3
+%setup -n yast2-ldap-client-2.15.4
%build
%{prefix}/bin/y2tool y2autoconf
@@ -83,7 +83,12 @@
%doc %{prefix}/share/doc/packages/yast2-ldap-client
/var/adm/fillup-templates/sysconfig.ldap
-%changelog -n yast2-ldap-client
+%changelog
+* Mon Feb 19 2007 - jsuchome@suse.cz
+- added login_enabled to Set/Export functions (#246235)
+- added Ldap::WriteNow for Write without abort block (#246237)
+- make 'createconfig' command line option non-mandatory
+- 2.15.4
* Tue Feb 06 2007 - jsuchome@suse.cz
- remove a dependency on yast2-slp (#238680)
- 2.15.3
++++++ yast2-ldap-client-2.15.3.tar.bz2 -> yast2-ldap-client-2.15.4.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.15.3/VERSION new/yast2-ldap-client-2.15.4/VERSION
--- old/yast2-ldap-client-2.15.3/VERSION 2007-02-06 12:58:50.000000000 +0100
+++ new/yast2-ldap-client-2.15.4/VERSION 2007-02-19 14:53:20.000000000 +0100
@@ -1 +1 @@
-2.15.3
+2.15.4
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.15.3/src/Ldap.ycp new/yast2-ldap-client-2.15.4/src/Ldap.ycp
--- old/yast2-ldap-client-2.15.3/src/Ldap.ycp 2007-01-29 09:54:01.000000000 +0100
+++ new/yast2-ldap-client-2.15.4/src/Ldap.ycp 2007-02-19 14:47:57.000000000 +0100
@@ -365,7 +365,7 @@
nss_base_group = settings ["nss_base_group"]:"";
member_attribute= settings ["member_attribute"]:"member";
create_ldap = settings ["create_ldap"]:false;
-
+ login_enabled = settings ["login_enabled"]:true;
_start_autofs = settings["start_autofs"]:false;
if (_start_autofs)
required_packages = (list<string>) union (required_packages, ["autofs"]);
@@ -409,7 +409,8 @@
"nss_base_group" : nss_base_group,
"pam_password" : pam_password,
"member_attribute" : member_attribute,
- "create_ldap" : create_ldap
+ "create_ldap" : create_ldap,
+ "login_enabled" : login_enabled
];
if (_autofs_allowed)
e["start_autofs"] = _start_autofs;
@@ -739,7 +740,7 @@
"schema": _("A problem occurred while reading schema from the LDAP server."),
];
- if (!use_gui)
+ if (!use_gui || Mode::commandline ())
{
y2error (error_type[type]:"Unknown LDAP error");
y2error (ldap_error[error]:error);
@@ -948,6 +949,7 @@
*/
global define string LDAPAskAndBind (boolean enable_anonymous) ``{
+ if (Mode::commandline ()) return nil;
string pw = GetLDAPPassword (enable_anonymous);
if (pw != nil)
{
@@ -2365,6 +2367,16 @@
}
/**
+ * wrapper for Write, without abort block
+ */
+ global define boolean WriteNow () {
+
+ block<boolean> abort = ``{ return false; };
+ return (Write(abort) == `next);
+ }
+
+
+ /**
* Check if base config DN belongs to some existing object and offer
* creating it if necessary
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.15.3/src/Makefile.am new/yast2-ldap-client-2.15.4/src/Makefile.am
--- old/yast2-ldap-client-2.15.3/src/Makefile.am 2007-02-06 10:39:15.000000000 +0100
+++ new/yast2-ldap-client-2.15.4/src/Makefile.am 2007-02-13 07:54:00.000000000 +0100
@@ -1,7 +1,7 @@
#
# Makefile.am for ldap-client/src
#
-# $Id: Makefile.am 33697 2006-10-26 13:10:39Z jsuchome $
+# $Id: Makefile.am 36062 2007-02-13 06:53:57Z jsuchome $
#
yncludedir = @yncludedir@/ldap
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.15.3/src/Makefile.in new/yast2-ldap-client-2.15.4/src/Makefile.in
--- old/yast2-ldap-client-2.15.3/src/Makefile.in 2007-02-06 10:47:47.000000000 +0100
+++ new/yast2-ldap-client-2.15.4/src/Makefile.in 2007-02-19 14:25:16.000000000 +0100
@@ -17,7 +17,7 @@
#
# Makefile.am for ldap-client/src
#
-# $Id: Makefile.am 33697 2006-10-26 13:10:39Z jsuchome $
+# $Id: Makefile.am 36062 2007-02-13 06:53:57Z jsuchome $
#
# Makefile.am.common -*- Makefile -*-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.15.3/src/ldap.ycp new/yast2-ldap-client-2.15.4/src/ldap.ycp
--- old/yast2-ldap-client-2.15.3/src/ldap.ycp 2007-01-29 09:54:01.000000000 +0100
+++ new/yast2-ldap-client-2.15.4/src/ldap.ycp 2007-02-19 14:58:36.000000000 +0100
@@ -83,9 +83,13 @@
Ldap::modified = true;
}
- string command = CommandLine::UniqueOption( options, ["createconfig"]);
- if( command == "createconfig" )
+ if (haskey (options, "createconfig"))
{
+ if (Ldap::bind_pass == nil)
+ {
+ // password entering label
+ Ldap::bind_pass = CommandLine::PasswordInput (_("LDAP Server Password:"));
+ }
Ldap::create_ldap = true;
Ldap::modified = true;
}
@@ -93,12 +97,6 @@
return Ldap::modified;
}
-define boolean LdapWrite () ``{
-
- block<boolean> abort = ``{ return false; };
- return (Ldap::Write(abort) == `next);
-}
-
/* the command line description map */
map cmdline = $[
"id" : "ldap",
@@ -106,7 +104,7 @@
"help" : _("LDAP client configuration module"),
"guihandler" : LdapSequence,
"initialize" : Ldap::Read,
- "finish" : LdapWrite,
+ "finish" : Ldap::WriteNow,
"actions" : $[
"pam" :$[
"handler" : LdapEnableHandler,
@@ -144,10 +142,12 @@
"type" : "string"
],
"createconfig" :$[
+ // command line help text for the 'createconfig' option
"help" : _("Create default configuration objects.")
],
"ldappw" :$[
- "help" : _("LDAP admin password"),
+ // command line help text for the 'ldappw' option
+ "help" : _("LDAP Server Password"),
"type" : "string"
],
],
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.15.3/src/ui.ycp new/yast2-ldap-client-2.15.4/src/ui.ycp
--- old/yast2-ldap-client-2.15.3/src/ui.ycp 2007-02-06 11:41:57.000000000 +0100
+++ new/yast2-ldap-client-2.15.4/src/ui.ycp 2007-02-13 07:54:00.000000000 +0100
@@ -5,7 +5,7 @@
* Authors: Thorsten Kukuk
* Anas Nashif
*
- * $Id: ui.ycp 35269 2007-01-12 11:04:13Z jsuchome $
+ * $Id: ui.ycp 36062 2007-02-13 06:53:57Z jsuchome $
*
* All user interface functions.
*/
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org