Author: jsuchome Date: Thu Jan 13 11:51:59 2011 New Revision: 63176 URL: http://svn.opensuse.org/viewcvs/yast?rev=63176&view=rev Log: - pass certificate data to .ldap agent (bnc#662949) - 2.20.6 Modified: trunk/ldap-client/VERSION trunk/ldap-client/package/yast2-ldap-client.changes trunk/ldap-client/src/Ldap.ycp trunk/ldap-client/src/LdapPopup.ycp trunk/ldap-client/src/ui.ycp trunk/ldap-client/testsuite/tests/LDAPInit.out trunk/ldap-client/testsuite/tests/LDAPInit.ycp Modified: trunk/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/VERSION?rev=63176&r1=63175&r2=63176&view=diff ============================================================================== --- trunk/ldap-client/VERSION (original) +++ trunk/ldap-client/VERSION Thu Jan 13 11:51:59 2011 @@ -1 +1 @@ -2.20.5 +2.20.6 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=63176&r1=63175&r2=63176&view=diff ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Thu Jan 13 11:51:59 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 13 11:37:48 CET 2011 - jsuchome@suse.cz + +- pass certificate data to .ldap agent (bnc#662949) +- 2.20.6 + +------------------------------------------------------------------- Wed Jan 12 12:58:31 CET 2011 - jsuchome@suse.cz - write uri instead of just host name to ldap.conf and sssd.conf Modified: trunk/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/Ldap.ycp?rev=63176&r1=63175&r2=63176&view=diff ============================================================================== --- trunk/ldap-client/src/Ldap.ycp (original) +++ trunk/ldap-client/src/Ldap.ycp Thu Jan 13 11:51:59 2011 @@ -1044,7 +1044,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) @@ -1126,7 +1128,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 @@ -1143,7 +1147,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: trunk/ldap-client/src/LdapPopup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/LdapPopup.ycp?rev=63176&r1=63175&r2=63176&view=diff ============================================================================== --- trunk/ldap-client/src/LdapPopup.ycp (original) +++ trunk/ldap-client/src/LdapPopup.ycp Thu Jan 13 11:51: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: trunk/ldap-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ui.ycp?rev=63176&r1=63175&r2=63176&view=diff ============================================================================== --- trunk/ldap-client/src/ui.ycp (original) +++ trunk/ldap-client/src/ui.ycp Thu Jan 13 11:51: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); @@ -761,7 +763,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 ]) ) { @@ -1057,7 +1061,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 != "") { @@ -1132,7 +1138,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: trunk/ldap-client/testsuite/tests/LDAPInit.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/testsuite/tests/LDAPInit.out?rev=63176&r1=63175&r2=63176&view=diff ============================================================================== --- trunk/ldap-client/testsuite/tests/LDAPInit.out (original) +++ trunk/ldap-client/testsuite/tests/LDAPInit.out Thu Jan 13 11:51: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: trunk/ldap-client/testsuite/tests/LDAPInit.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/testsuite/tests/LDAPInit.ycp?rev=63176&r1=63175&r2=63176&view=diff ============================================================================== --- trunk/ldap-client/testsuite/tests/LDAPInit.ycp (original) +++ trunk/ldap-client/testsuite/tests/LDAPInit.ycp Thu Jan 13 11:51: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@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org