Hello community,
here is the log from the commit of package yast2-ldap-client
checked in at Tue Mar 6 11:21:09 CET 2007.
--------
--- yast2-ldap-client/yast2-ldap-client.changes 2007-02-19 15:13:12.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-ldap-client/yast2-ldap-client.changes 2007-03-06 10:34:35.682650000 +0100
@@ -1,0 +2,6 @@
+Tue Mar 6 10:22:36 CET 2007 - jsuchome@suse.cz
+
+- browser: offer possibility to connect without TLS (#246397)
+- 2.15.5
+
+-------------------------------------------------------------------
Old:
----
yast2-ldap-client-2.15.4.tar.bz2
New:
----
yast2-ldap-client-2.15.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ldap-client.spec ++++++
--- /var/tmp/diff_new_pack.L11846/_old 2007-03-06 11:20:57.000000000 +0100
+++ /var/tmp/diff_new_pack.L11846/_new 2007-03-06 11:20:57.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-ldap-client (Version 2.15.4)
+# spec file for package yast2-ldap-client (Version 2.15.5)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,16 +11,18 @@
# norootforbuild
Name: yast2-ldap-client
-Version: 2.15.4
+Version: 2.15.5
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ldap-client-2.15.4.tar.bz2
+Source0: yast2-ldap-client-2.15.5.tar.bz2
prefix: /usr
BuildRequires: doxygen perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-network yast2-pam yast2-testsuite
PreReq: %fillup_prereq
-Requires: yast2 yast2-ldap yast2-network
+Requires: yast2 yast2-network
+# check for tls_error
+Requires: yast2-ldap >= 2.15.1
# new API of Pam.ycp
Requires: yast2-pam >= 2.14.0
Provides: yast2-config-ldap_client
@@ -42,7 +44,7 @@
Jiri Suchomel
%prep
-%setup -n yast2-ldap-client-2.15.4
+%setup -n yast2-ldap-client-2.15.5
%build
%{prefix}/bin/y2tool y2autoconf
@@ -84,6 +86,9 @@
/var/adm/fillup-templates/sysconfig.ldap
%changelog
+* Tue Mar 06 2007 - jsuchome@suse.cz
+- browser: offer possibility to connect without TLS (#246397)
+- 2.15.5
* Mon Feb 19 2007 - jsuchome@suse.cz
- added login_enabled to Set/Export functions (#246235)
- added Ldap::WriteNow for Write without abort block (#246237)
++++++ yast2-ldap-client-2.15.4.tar.bz2 -> yast2-ldap-client-2.15.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.15.4/src/ldap_browser.ycp new/yast2-ldap-client-2.15.5/src/ldap_browser.ycp
--- old/yast2-ldap-client-2.15.4/src/ldap_browser.ycp 2007-01-12 12:04:17.000000000 +0100
+++ new/yast2-ldap-client-2.15.5/src/ldap_browser.ycp 2007-03-06 10:22:25.000000000 +0100
@@ -79,6 +79,56 @@
return size (tmp_data) > 0;
}
+ /**
+ * popup shown after failed connection: ask for retry withou TLS (see bug 246397)
+ * @return true if user wants to retry without TLS
+ */
+ define boolean connect_without_tls (map errmap) {
+
+ UI::OpenDialog (`HBox(`HSpacing (0.5),
+ `VBox(
+ `VSpacing (0.5),
+ // label
+ `Left (`Heading (Label::ErrorMsg())),
+ // error message
+ `Left (`Label (_("Connection to the LDAP server cannot be established."))),
+ `ReplacePoint (`id(`rp), `Empty()),
+ `VSpacing (0.2),
+ `Left (`CheckBox (`id(`details), `opt (`notify),
+ // checkbox label
+ _("&Show Details"), false)),
+ `VSpacing (),
+ `Left (`Label (
+ // question following error message (yes/no buttons follow)
+_("A possible cause of the failed connection may be that your client is
+configured for TLS/SSL but the server does not support it.
+
+Retry connection without TLS/SSL?"))),
+ `HBox (
+ `PushButton (`id(`yes), `opt(`key_F10,`default), Label::YesButton()),
+ `PushButton (`id(`no),`opt(`key_F9), Label::NoButton())
+ )
+ ),
+ `HSpacing(0.5))
+ );
+ any ret = nil;
+ do
+ {
+ ret = UI::UserInput();
+ if (ret == `details)
+ {
+ if ((boolean)UI::QueryWidget (`id(`details), `Value))
+ UI::ReplaceWidget (`id(`rp), `VBox (
+ `Label (errmap["msg"]:"")));
+ else
+ UI::ReplaceWidget (`id(`rp), `Empty());
+ }
+ }
+ while (ret != `yes && ret != `no);
+ UI::CloseDialog ();
+ return ret == `yes;
+ }
+
// helper: create the value that should be shown instead of whole DN in tree
define string show_dn (string dn) {
if (topdns[dn]:false)
@@ -307,11 +357,31 @@
Ldap::bind_pass = (string) UI::QueryWidget(`id(`pw), `Value);
Ldap::SetAnonymous (ret == `anon);
- string error = Ldap::LDAPInit ();
- if (error != "")
+ string error = "";
+ map args = $[
+ "hostname" : Ldap::GetFirstServer (Ldap::server),
+ "port" : Ldap::GetFirstPort (Ldap::server),
+ "version" : Ldap::ldap_v2 ? 2 : 3,
+ "use_tls" : Ldap::ldap_tls ? "yes" : "no"
+ ];
+ if (SCR::Execute (.ldap, args) != true)
{
- Ldap::LDAPErrorMessage ("init", error);
- continue;
+ map errmap = Ldap::LDAPErrorMap ();
+ if (Ldap::ldap_tls && errmap["tls_error"]:false && connect_without_tls (errmap))
+ {
+ Ldap::ldap_tls = false;
+ error = Ldap::LDAPInit ();
+ if (error != "")
+ {
+ Ldap::LDAPErrorMessage ("init", error);
+ continue;
+ }
+ }
+ else
+ {
+ Ldap::LDAPErrorMessage ("init", errmap["msg"]:"");
+ continue;
+ }
}
error = Ldap::LDAPBind (Ldap::bind_pass);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.15.4/src/ldap.ycp new/yast2-ldap-client-2.15.5/src/ldap.ycp
--- old/yast2-ldap-client-2.15.4/src/ldap.ycp 2007-02-19 14:58:36.000000000 +0100
+++ new/yast2-ldap-client-2.15.5/src/ldap.ycp 2007-02-19 15:17:46.000000000 +0100
@@ -5,7 +5,7 @@
* Authors: Thorsten Kukuk
* Anas Nashif
*
- * $Id: ldap.ycp 35671 2007-01-29 08:53:58Z jsuchome $
+ * $Id: ldap.ycp 36266 2007-02-19 14:17:43Z jsuchome $
*/
/***
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.15.4/src/Ldap.ycp new/yast2-ldap-client-2.15.5/src/Ldap.ycp
--- old/yast2-ldap-client-2.15.4/src/Ldap.ycp 2007-02-19 14:47:57.000000000 +0100
+++ new/yast2-ldap-client-2.15.5/src/Ldap.ycp 2007-02-19 15:17:46.000000000 +0100
@@ -5,7 +5,7 @@
* Authors: Thorsten Kukuk
* Anas Nashif
*
- * $Id: Ldap.ycp 35671 2007-01-29 08:53:58Z jsuchome $
+ * $Id: Ldap.ycp 36266 2007-02-19 14:17:43Z jsuchome $
*/
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.15.4/VERSION new/yast2-ldap-client-2.15.5/VERSION
--- old/yast2-ldap-client-2.15.4/VERSION 2007-02-19 14:53:20.000000000 +0100
+++ new/yast2-ldap-client-2.15.5/VERSION 2007-03-06 10:23:20.000000000 +0100
@@ -1 +1 @@
-2.15.4
+2.15.5
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org