Mailinglist Archive: yast-commit (535 mails)

< Previous Next >
[yast-commit] r41549 - in /trunk/ldap-client: VERSION package/yast2-ldap-client.changes src/Ldap.ycp src/ui.ycp
  • From: jsuchome@xxxxxxxxxxxxxxxx
  • Date: Wed, 24 Oct 2007 14:31:11 -0000
  • Message-id: <20071024143111.E341B2D1CA@xxxxxxxxxxxxxxxx>
Author: jsuchome
Date: Wed Oct 24 16:31:11 2007
New Revision: 41549

URL: http://svn.opensuse.org/viewcvs/yast?rev=41549&view=rev
Log:
- if crypted connection is switched off, adapt the checkbox value
(#330054)
- 2.16.1


Modified:
trunk/ldap-client/VERSION
trunk/ldap-client/package/yast2-ldap-client.changes
trunk/ldap-client/src/Ldap.ycp
trunk/ldap-client/src/ui.ycp

Modified: trunk/ldap-client/VERSION
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/VERSION?rev=41549&r1=41548&r2=41549&view=diff
==============================================================================
--- trunk/ldap-client/VERSION (original)
+++ trunk/ldap-client/VERSION Wed Oct 24 16:31:11 2007
@@ -1 +1 @@
-2.16.0
+2.16.1

Modified: trunk/ldap-client/package/yast2-ldap-client.changes
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-client.changes?rev=41549&r1=41548&r2=41549&view=diff
==============================================================================
--- trunk/ldap-client/package/yast2-ldap-client.changes (original)
+++ trunk/ldap-client/package/yast2-ldap-client.changes Wed Oct 24 16:31:11 2007
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Wed Oct 24 16:15:42 CEST 2007 - jsuchome@xxxxxxx
+
+- if crypted connection is switched off, adapt the checkbox value
+ (#330054)
+- 2.16.1
+
+-------------------------------------------------------------------
Fri Oct 12 11:37:27 CEST 2007 - jsuchome@xxxxxxx

- clear nscd cache instead of restarting nscd (#333305)

Modified: trunk/ldap-client/src/Ldap.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/Ldap.ycp?rev=41549&r1=41548&r2=41549&view=diff
==============================================================================
--- trunk/ldap-client/src/Ldap.ycp (original)
+++ trunk/ldap-client/src/Ldap.ycp Wed Oct 24 16:31:11 2007
@@ -157,6 +157,9 @@
// if eDirectory is used as server
global boolean nds = false;

+ // if crypted connection was switched of after failure (#330054)
+ global boolean tls_switched_off = false;
+
boolean nds_checked = false;

// if OES is used as a client
@@ -958,7 +961,8 @@
if (!init)
{
map errmap = Ldap::LDAPErrorMap ();
- if (ldap_tls && errmap["tls_error"]:false && ConnectWithoutTLS
(errmap))
+ if (args["use_tls"]:"" == "yes" &&
+ errmap["tls_error"]:false && ConnectWithoutTLS (errmap))
{
args["use_tls"] = false;
init = (boolean) SCR::Execute (.ldap, args);
@@ -966,6 +970,11 @@
ret = unknown;
else if (!init)
ret = LDAPError();
+ else
+ {
+ y2milestone ("switching TLS off...");
+ tls_switched_off = true;
+ }
}
else
{

Modified: trunk/ldap-client/src/ui.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ui.ycp?rev=41549&r1=41548&r2=41549&view=diff
==============================================================================
--- trunk/ldap-client/src/ui.ycp (original)
+++ trunk/ldap-client/src/ui.ycp Wed Oct 24 16:31:11 2007
@@ -358,6 +358,7 @@
}
if (result == `fetch)
{
+ Ldap::tls_switched_off = false;
string dn = Ldap::ldap_initialized ?
LdapPopup::BrowseTree ("") :
LdapPopup::InitAndBrowseTree ("", $[
@@ -368,6 +369,11 @@
]);
if (dn != "")
UI::ChangeWidget (`id(`ldapd), `Value, dn);
+ // adapt the checkbox value
+ if (Ldap::tls_switched_off)
+ {
+ UI::ChangeWidget (`id (`ldaps), `Value, false);
+ }
}

if (result == `next || result == `advanced) {

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages