Hello community,
here is the log from the commit of package yast2-ldap-client for openSUSE:Factory
checked in at Fri Feb 4 18:11:27 CET 2011.
--------
--- yast2-ldap-client/yast2-ldap-client.changes 2011-02-01 11:53:16.000000000 +0100
+++ yast2-ldap-client/yast2-ldap-client.changes 2011-02-04 09:00:55.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Feb 4 08:57:50 CET 2011 - jsuchome@suse.cz
+
+- reset connection when TLS status has been changed (bnc#662949)
+- 2.20.14
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-ldap-client-2.20.13.tar.bz2
New:
----
yast2-ldap-client-2.20.14.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ldap-client.spec ++++++
--- /var/tmp/diff_new_pack.Cwl8jn/_old 2011-02-04 18:09:34.000000000 +0100
+++ /var/tmp/diff_new_pack.Cwl8jn/_new 2011-02-04 18:09:34.000000000 +0100
@@ -19,11 +19,11 @@
Name: yast2-ldap-client
-Version: 2.20.13
+Version: 2.20.14
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ldap-client-2.20.13.tar.bz2
+Source0: yast2-ldap-client-2.20.14.tar.bz2
Prefix: /usr
@@ -38,8 +38,8 @@
Requires: yast2-network
-# removed lowercasing of LDAP object names
-Requires: yast2-ldap >= 2.17.1
+# .close
+Requires: yast2-ldap >= 2.20.1
# etc_sssd_conf.scr
Requires: yast2-pam >= 2.20.0
@@ -58,7 +58,7 @@
OpenLDAP server will be used for user authentication.
%prep
-%setup -n yast2-ldap-client-2.20.13
+%setup -n yast2-ldap-client-2.20.14
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-ldap-client-2.20.13.tar.bz2 -> yast2-ldap-client-2.20.14.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-2.20.13/VERSION new/yast2-ldap-client-2.20.14/VERSION
--- old/yast2-ldap-client-2.20.13/VERSION 2011-02-01 11:33:07.000000000 +0100
+++ new/yast2-ldap-client-2.20.14/VERSION 2011-02-04 08:58:46.000000000 +0100
@@ -1 +1 @@
-2.20.13
+2.20.14
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-2.20.13/src/Ldap.ycp new/yast2-ldap-client-2.20.14/src/Ldap.ycp
--- old/yast2-ldap-client-2.20.13/src/Ldap.ycp 2011-02-01 11:30:22.000000000 +0100
+++ new/yast2-ldap-client-2.20.14/src/Ldap.ycp 2011-02-04 15:19:58.000000000 +0100
@@ -5,7 +5,7 @@
* Authors: Thorsten Kukuk
* Anas Nashif
*
- * $Id: Ldap.ycp 63288 2011-02-01 09:38:34Z jsuchome $
+ * $Id: Ldap.ycp 63351 2011-02-04 14:19:57Z jsuchome $
*/
{
@@ -272,6 +272,9 @@
global boolean ldap_initialized = false;
+ // was LDAP connection initialized with TLS?
+ global boolean tls_when_initialized = false;
+
/**
* If false, do not read settings already set from outside
* used e.g. for Users YaPI. see bug #60898
@@ -1097,6 +1100,14 @@
}
/**
+ * Shut down existing LDAP connection
+ */
+ global define boolean LDAPClose () {
+ ldap_initialized = false;
+ return (boolean) SCR::Execute (.ldap.close);
+ }
+
+ /**
* Initializes LDAP agent
*/
global define string LDAPInit () ``{
@@ -1120,6 +1131,7 @@
else
{
ldap_initialized = init;
+ tls_when_initialized= ldap_tls;
if (!init)
{
ret = LDAPError();
@@ -1134,6 +1146,10 @@
*/
global define boolean ConnectWithoutTLS (map errmap) {
+ string details = errmap["msg"]:"";
+ if (errmap["server_msg"]:"" != "")
+ details = sformat ("%1\n%2", details, errmap["server_msg"]:"");
+
UI::OpenDialog (`HBox(`HSpacing (0.5),
`VBox(
`VSpacing (0.5),
@@ -1168,8 +1184,10 @@
if (ret == `details)
{
if ((boolean)UI::QueryWidget (`id(`details), `Value))
- UI::ReplaceWidget (`id(`rp), `VBox (
- `Label (errmap["msg"]:"")));
+ {
+
+ UI::ReplaceWidget (`id(`rp), `VBox (`Label (details)));
+ }
else
UI::ReplaceWidget (`id(`rp), `Empty());
}
@@ -1230,6 +1248,7 @@
}
}
ldap_initialized = init;
+ tls_when_initialized= args["use_tls"]:"no" == "yes";
}
return ret;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-2.20.13/src/ui.ycp new/yast2-ldap-client-2.20.14/src/ui.ycp
--- old/yast2-ldap-client-2.20.13/src/ui.ycp 2011-01-21 17:02:06.000000000 +0100
+++ new/yast2-ldap-client-2.20.14/src/ui.ycp 2011-02-04 15:19:58.000000000 +0100
@@ -5,7 +5,7 @@
* Authors: Thorsten Kukuk
* Anas Nashif
*
- * $Id: ui.ycp 63257 2011-01-21 16:02:05Z jsuchome $
+ * $Id: ui.ycp 63351 2011-02-04 14:19:57Z jsuchome $
*
* All user interface functions.
*/
@@ -368,6 +368,10 @@
if (result == `fetch)
{
Ldap::tls_switched_off = false;
+ if (Ldap::ldap_initialized && Ldap::tls_when_initialized != ldap_tls)
+ {
+ Ldap::LDAPClose ();
+ }
string dn = Ldap::ldap_initialized ?
LdapPopup::BrowseTree ("") :
LdapPopup::InitAndBrowseTree ("", $[
@@ -764,15 +768,12 @@
if (base_dn == "") return;
- if (Ldap::ldap_initialized || true == SCR::Execute (.ldap, $[
- "hostname" : Ldap::GetFirstServer (Ldap::server),
- "port" : Ldap::GetFirstPort (Ldap::server),
- "version" : Ldap::ldap_v2 ? 2 : 3,
- "use_tls" : Ldap::ldap_tls ? "yes" : "no",
- "cacertdir" : Ldap::tls_cacertdir,
- "cacertfile": Ldap::tls_cacertfile
- ])
- )
+ if (Ldap::ldap_initialized && Ldap::tls_when_initialized != Ldap::ldap_tls)
+ {
+ Ldap::LDAPClose ();
+ }
+
+ if (Ldap::ldap_initialized || Ldap::LDAPInit () == "")
{
ppolicies_enabled = (boolean) SCR::Execute (.ldap.ppolicy, $[
"hostname" : Ldap::GetFirstServer (Ldap::server),
@@ -1092,6 +1093,10 @@
if (is (result, symbol) &&
contains ([`br, `br_passwd, `br_shadow, `br_group ], (symbol)result))
{
+ if (Ldap::ldap_initialized && Ldap::tls_when_initialized != Ldap::ldap_tls)
+ {
+ Ldap::LDAPClose ();
+ }
string dn = Ldap::ldap_initialized ?
LdapPopup::BrowseTree (base_dn) :
LdapPopup::InitAndBrowseTree (base_dn, $[
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org