Mailinglist Archive: yast-commit (195 mails)

< Previous Next >
[yast-commit] r63608 - in /branches/SuSE-Code-11-SP2-Branch/ldap-client: src/Ldap.ycp src/LdapPopup.ycp src/ui.ycp testsuite/tests/LDAPInit.out testsuite/tests/LDAPInit.ycp
Author: jsuchome
Date: Fri Mar 18 17:00:59 2011
New Revision: 63608

URL: http://svn.opensuse.org/viewcvs/yast?rev=63608&view=rev
Log:
pass certificate data to .ldap agent (bnc#662949)


Modified:
branches/SuSE-Code-11-SP2-Branch/ldap-client/src/Ldap.ycp
branches/SuSE-Code-11-SP2-Branch/ldap-client/src/LdapPopup.ycp
branches/SuSE-Code-11-SP2-Branch/ldap-client/src/ui.ycp
branches/SuSE-Code-11-SP2-Branch/ldap-client/testsuite/tests/LDAPInit.out
branches/SuSE-Code-11-SP2-Branch/ldap-client/testsuite/tests/LDAPInit.ycp

Modified: branches/SuSE-Code-11-SP2-Branch/ldap-client/src/Ldap.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-client/src/Ldap.ycp?rev=63608&r1=63607&r2=63608&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/ldap-client/src/Ldap.ycp (original)
+++ branches/SuSE-Code-11-SP2-Branch/ldap-client/src/Ldap.ycp Fri Mar 18
17:00:59 2011
@@ -1072,7 +1072,9 @@
"hostname": GetFirstServer (server),
"port": GetFirstPort (server),
"version": ldap_v2 ? 2 : 3,
- "use_tls": ldap_tls ? "yes" : "no"
+ "use_tls": ldap_tls ? "yes" : "no",
+ "cacertdir" : Ldap::tls_cacertdir,
+ "cacertfile": Ldap::tls_cacertfile
];
boolean init = (boolean) SCR::Execute (.ldap, args);
if (init == nil)
@@ -1154,7 +1156,9 @@
"hostname" : GetFirstServer (server),
"port" : GetFirstPort (server),
"version" : ldap_v2 ? 2 : 3,
- "use_tls" : ldap_tls ? "yes" : "no"
+ "use_tls" : ldap_tls ? "yes" : "no",
+ "cacertdir" : Ldap::tls_cacertdir,
+ "cacertfile" : Ldap::tls_cacertfile
];
boolean init = (boolean) SCR::Execute (.ldap, args);
// error message
@@ -1171,7 +1175,7 @@
if (args["use_tls"]:"" == "yes" &&
errmap["tls_error"]:false && ConnectWithoutTLS (errmap))
{
- args["use_tls"] = false;
+ args["use_tls"] = "no";
init = (boolean) SCR::Execute (.ldap, args);
if (init == nil)
ret = unknown;

Modified: branches/SuSE-Code-11-SP2-Branch/ldap-client/src/LdapPopup.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-client/src/LdapPopup.ycp?rev=63608&r1=63607&r2=63608&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/ldap-client/src/LdapPopup.ycp (original)
+++ branches/SuSE-Code-11-SP2-Branch/ldap-client/src/LdapPopup.ycp Fri Mar 18
17:00:59 2011
@@ -189,7 +189,9 @@
"hostname" : Ldap::GetFirstServer (Ldap::server),
"port" : Ldap::GetFirstPort (Ldap::server),
"version" : Ldap::ldap_v2 ? 2 : 3,
- "use_tls" : Ldap::ldap_tls ? "yes" : "no"
+ "use_tls" : Ldap::ldap_tls ? "yes" : "no",
+ "cacertdir" : Ldap::tls_cacertdir,
+ "cacertfile": Ldap::tls_cacertfile
];
string error = Ldap::LDAPInitWithTLSCheck (args);
if (error != "")

Modified: branches/SuSE-Code-11-SP2-Branch/ldap-client/src/ui.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-client/src/ui.ycp?rev=63608&r1=63607&r2=63608&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/ldap-client/src/ui.ycp (original)
+++ branches/SuSE-Code-11-SP2-Branch/ldap-client/src/ui.ycp Fri Mar 18 17:00:59
2011
@@ -374,7 +374,9 @@
"hostname" : Ldap::GetFirstServer (server),
"port" : Ldap::GetFirstPort (server),
"version" : Ldap::ldap_v2 ? 2 : 3,
- "use_tls" : ldap_tls ? "yes" : "no"
+ "use_tls" : ldap_tls ? "yes" : "no",
+ "cacertdir" : Ldap::tls_cacertdir,
+ "cacertfile" : Ldap::tls_cacertfile
]);
if (dn != "")
UI::ChangeWidget (`id(`ldapbasedn), `Value, dn);
@@ -759,7 +761,9 @@
"hostname" : Ldap::GetFirstServer (Ldap::server),
"port" : Ldap::GetFirstPort (Ldap::server),
"version" : Ldap::ldap_v2 ? 2 : 3,
- "use_tls" : Ldap::ldap_tls ? "yes" : "no"
+ "use_tls" : Ldap::ldap_tls ? "yes" : "no",
+ "cacertdir" : Ldap::tls_cacertdir,
+ "cacertfile": Ldap::tls_cacertfile
])
)
{
@@ -1055,7 +1059,9 @@
"hostname" : Ldap::GetFirstServer (Ldap::server),
"port" : Ldap::GetFirstPort (Ldap::server),
"version" : Ldap::ldap_v2 ? 2 : 3,
- "use_tls" : Ldap::ldap_tls ? "yes" : "no"
+ "use_tls" : Ldap::ldap_tls ? "yes" : "no",
+ "cacertdir" : Ldap::tls_cacertdir,
+ "cacertfile": Ldap::tls_cacertfile
]);
if (dn != "")
{
@@ -1130,7 +1136,9 @@
"hostname" : Ldap::GetFirstServer (Ldap::server),
"port" : Ldap::GetFirstPort (Ldap::server),
"version" : Ldap::ldap_v2 ? 2 : 3,
- "use_tls" : Ldap::ldap_tls ? "yes" : "no"
+ "use_tls" : Ldap::ldap_tls ? "yes" : "no",
+ "cacertdir" : Ldap::tls_cacertdir,
+ "cacertfile" : Ldap::tls_cacertfile
]);
if (suf != "")
UI::ReplaceWidget (`id (`rp_suf), `HBox (

Modified:
branches/SuSE-Code-11-SP2-Branch/ldap-client/testsuite/tests/LDAPInit.out
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-client/testsuite/tests/LDAPInit.out?rev=63608&r1=63607&r2=63608&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/ldap-client/testsuite/tests/LDAPInit.out
(original)
+++ branches/SuSE-Code-11-SP2-Branch/ldap-client/testsuite/tests/LDAPInit.out
Fri Mar 18 17:00:59 2011
@@ -1,16 +1,16 @@
Dump ==== init (one server, no port set) ==============
Dump ==== value of server: "localhost"
-Execute .ldap $["hostname":"localhost", "port":389, "use_tls":"no",
"version":3] true
+Execute .ldap $["cacertdir":"", "cacertfile":"",
"hostname":"localhost", "port":389, "use_tls":"no", "version":3] true
Return
Dump ==== init (one server, nonsence port set) ========
Dump ==== value of server: "localhost:sdgfd#$"
-Execute .ldap $["hostname":"localhost", "port":389, "use_tls":"no",
"version":3] true
+Execute .ldap $["cacertdir":"", "cacertfile":"",
"hostname":"localhost", "port":389, "use_tls":"no", "version":3] true
Return
Dump ==== init (more servers set, TLS used) ===========
Dump ==== value of server: "chimera.suse.cz:333 localhost"
-Execute .ldap $["hostname":"chimera.suse.cz", "port":333,
"use_tls":"yes", "version":2] true
+Execute .ldap $["cacertdir":"/etc/ssl/certs", "cacertfile":"",
"hostname":"chimera.suse.cz", "port":333, "use_tls":"yes", "version":2] true
Return
Dump ==== init failed =================================
-Execute .ldap $["hostname":"chimera.suse.cz", "port":333,
"use_tls":"yes", "version":2] false
+Execute .ldap $["cacertdir":"/etc/ssl/certs", "cacertfile":"",
"hostname":"chimera.suse.cz", "port":333, "use_tls":"yes", "version":2] false
Read .ldap.error $["code":11, "msg":"Initialization failed"]
Return Initialization failed

Modified:
branches/SuSE-Code-11-SP2-Branch/ldap-client/testsuite/tests/LDAPInit.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-client/testsuite/tests/LDAPInit.ycp?rev=63608&r1=63607&r2=63608&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/ldap-client/testsuite/tests/LDAPInit.ycp
(original)
+++ branches/SuSE-Code-11-SP2-Branch/ldap-client/testsuite/tests/LDAPInit.ycp
Fri Mar 18 17:00:59 2011
@@ -49,6 +49,7 @@
Ldap::server = "chimera.suse.cz:333 localhost";
Ldap::ldap_v2 = true;
Ldap::ldap_tls = true;
+ Ldap::tls_cacertdir = "/etc/ssl/certs";

DUMP (sformat ("==== value of server: \"%1\"", Ldap::server));


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

< Previous Next >
This Thread
  • No further messages