Author: jsuchome Date: Thu Jan 19 15:36:33 2012 New Revision: 67232 URL: http://svn.opensuse.org/viewcvs/yast?rev=67232&view=rev Log: - removed obsolete version 2 reference (fate#313143) - confirmed license - 2.22.2 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/ldap-client.ycp trunk/ldap-client/src/ldap.ycp trunk/ldap-client/src/ldap_auto.ycp trunk/ldap-client/src/ldap_browser.ycp trunk/ldap-client/src/ldap_client.rnc trunk/ldap-client/src/ldap_config.ycp trunk/ldap-client/src/routines.ycp trunk/ldap-client/src/ui.ycp trunk/ldap-client/src/wizards.ycp trunk/ldap-client/testsuite/tests/Export.out trunk/ldap-client/testsuite/tests/Export2.out trunk/ldap-client/testsuite/tests/Export3.out trunk/ldap-client/testsuite/tests/LDAPInit.out trunk/ldap-client/testsuite/tests/LDAPInit.ycp trunk/ldap-client/testsuite/tests/Read.out trunk/ldap-client/testsuite/tests/Read2.out trunk/ldap-client/yast2-ldap-client.spec.in Modified: trunk/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/VERSION?rev=67232&r1=67231&r2=67232&view=diff ============================================================================== --- trunk/ldap-client/VERSION (original) +++ trunk/ldap-client/VERSION Thu Jan 19 15:36:33 2012 @@ -1 +1 @@ -2.22.1 +2.22.2 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=67232&r1=67231&r2=67232&view=diff ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Thu Jan 19 15:36:33 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jan 19 14:56:43 CET 2012 - jsuchome@suse.cz + +- removed obsolete version 2 reference (fate#313143) +- confirmed license +- 2.22.2 + +------------------------------------------------------------------- Wed Nov 16 15:35:53 CET 2011 - jsuchome@suse.cz - correctly handle sssd config with more LDAP servers (bnc#729174) Modified: trunk/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/Ldap.ycp?rev=67232&r1=67231&r2=67232&view=diff ============================================================================== --- trunk/ldap-client/src/Ldap.ycp (original) +++ trunk/ldap-client/src/Ldap.ycp Thu Jan 19 15:36:33 2012 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: modules/Ldap.ycp * Module: Configuration of LDAP client @@ -108,8 +128,6 @@ string old_base_dn = nil; boolean base_dn_changed = false; - /* Do we have an v2 or v3 ldap server? */ - global boolean ldap_v2 = false; global boolean ldap_tls = false; // CA certificates for server certificate verification @@ -432,7 +450,6 @@ server = settings ["ldap_server"]:""; // leaving "ldap_domain" for backward compatibility base_dn = settings ["ldap_domain"]:""; - ldap_v2 = settings ["ldap_v2"]:false; ldap_tls = settings ["ldap_tls"]:false; pam_password = settings ["pam_password"]:"exop"; bind_dn = settings ["bind_dn"]:""; @@ -487,7 +504,6 @@ "start_ldap" : start, "ldap_server" : server, "ldap_domain" : base_dn, - "ldap_v2" : ldap_v2, "ldap_tls" : ldap_tls, "bind_dn" : bind_dn, "file_server" : file_server, @@ -551,7 +567,7 @@ // summary item summary = Summary::AddHeader(summary, _("System Security Services Daemon (SSSD) Set")); - // summary (LDAP version 2?) + // summary (SSSD Set?) summary = Summary::AddLine(summary, (sssd && start) ? _("Yes") : Summary::NotConfigured()); return summary; @@ -832,7 +848,6 @@ } } - ldap_v2 = (ReadLdapConfEntry ("ldap_version", "3") == "2"); ldap_tls = (ReadLdapConfEntry ("ssl", "no") == "start_tls"); tls_cacertdir = ReadLdapConfEntry ("tls_cacertdir", ""); tls_cacertfile = ReadLdapConfEntry ("tls_cacertfile", ""); @@ -1155,7 +1170,6 @@ map args = $[ "hostname": GetFirstServer (server), "port": GetFirstPort (server), - "version": ldap_v2 ? 2 : 3, "use_tls": ldap_tls ? "yes" : "no", "cacertdir" : Ldap::tls_cacertdir, "cacertfile": Ldap::tls_cacertfile @@ -1336,7 +1350,6 @@ args = $[ "hostname" : GetFirstServer (server), "port" : GetFirstPort (server), - "version" : ldap_v2 ? 2 : 3, "use_tls" : ldap_tls ? "yes" : "no", "cacertdir" : Ldap::tls_cacertdir, "cacertfile" : Ldap::tls_cacertfile @@ -2711,11 +2724,6 @@ WriteOpenLdapConf(); - if (ldap_v2) - WriteLdapConfEntry ("ldap_version", "2"); - else - WriteLdapConfEntry ("ldap_version", "3"); - if (ldap_tls) WriteLdapConfEntry ("ssl", "start_tls"); else Modified: trunk/ldap-client/src/LdapPopup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/LdapPopup.ycp?rev=67232&r1=67231&r2=67232&view=diff ============================================================================== --- trunk/ldap-client/src/LdapPopup.ycp (original) +++ trunk/ldap-client/src/LdapPopup.ycp Thu Jan 19 15:36:33 2012 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: modules/LdapPopup.ycp * Package: Configuration of LDAP @@ -189,7 +209,6 @@ map args = size (connection) > 0 ? connection : $[ "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 Modified: trunk/ldap-client/src/ldap-client.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ldap-client.ycp?rev=67232&r1=67231&r2=67232&view=diff ============================================================================== --- trunk/ldap-client/src/ldap-client.ycp (original) +++ trunk/ldap-client/src/ldap-client.ycp Thu Jan 19 15:36:33 2012 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * Author: Jiri Suchomel * Summary: Just a redirection Modified: trunk/ldap-client/src/ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ldap.ycp?rev=67232&r1=67231&r2=67232&view=diff ============================================================================== --- trunk/ldap-client/src/ldap.ycp (original) +++ trunk/ldap-client/src/ldap.ycp Thu Jan 19 15:36:33 2012 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: clients/ldap.ycp * Module: Configuration of LDAP client Modified: trunk/ldap-client/src/ldap_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ldap_auto.ycp?rev=67232&r1=67231&r2=67232&view=diff ============================================================================== --- trunk/ldap-client/src/ldap_auto.ycp (original) +++ trunk/ldap-client/src/ldap_auto.ycp Thu Jan 19 15:36:33 2012 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: clients/ldap_auto.ycp * Package: Configuration of LDAP client Modified: trunk/ldap-client/src/ldap_browser.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ldap_browser.ycp?rev=67232&r1=67231&r2=67232&view=diff ============================================================================== --- trunk/ldap-client/src/ldap_browser.ycp (original) +++ trunk/ldap-client/src/ldap_browser.ycp Thu Jan 19 15:36:33 2012 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: clients/ldap/ldap_browser.ycp * Package: Configuration of LDAP Modified: trunk/ldap-client/src/ldap_client.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ldap_client.rnc?rev=67232&r1=67231&r2=67232&view=diff ============================================================================== --- trunk/ldap-client/src/ldap_client.rnc (original) +++ trunk/ldap-client/src/ldap_client.rnc Thu Jan 19 15:36:33 2012 @@ -9,7 +9,6 @@ ldap_domain? & ldap_server? & ldap_tls? & - ldap_v2? & create_ldap? & start_ldap? & member_attribute? & @@ -33,7 +32,6 @@ file_server = element file_server { BOOLEAN } ldap_tls = element ldap_tls { BOOLEAN } -ldap_v2 = element ldap_v2 { BOOLEAN } start_ldap = element start_ldap { BOOLEAN } create_ldap = element create_ldap { BOOLEAN } start_autofs = element start_autofs { BOOLEAN } Modified: trunk/ldap-client/src/ldap_config.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ldap_config.ycp?rev=67232&r1=67231&r2=67232&view=diff ============================================================================== --- trunk/ldap-client/src/ldap_config.ycp (original) +++ trunk/ldap-client/src/ldap_config.ycp Thu Jan 19 15:36:33 2012 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: clients/ldap.ycp * Module: Configuration of LDAP client Modified: trunk/ldap-client/src/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/routines.ycp?rev=67232&r1=67231&r2=67232&view=diff ============================================================================== --- trunk/ldap-client/src/routines.ycp (original) +++ trunk/ldap-client/src/routines.ycp Thu Jan 19 15:36:33 2012 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: include/ldap/routines.ycp * Package: Configuration of LDAP Modified: trunk/ldap-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ui.ycp?rev=67232&r1=67231&r2=67232&view=diff ============================================================================== --- trunk/ldap-client/src/ui.ycp (original) +++ trunk/ldap-client/src/ui.ycp Thu Jan 19 15:36:33 2012 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: include/ldap/ui.ycp * Package: Configuration of LDAP @@ -376,7 +396,6 @@ LdapPopup::InitAndBrowseTree ("", $[ "hostname" : Ldap::GetFirstServer (server), "port" : Ldap::GetFirstPort (server), - "version" : Ldap::ldap_v2 ? 2 : 3, "use_tls" : ldap_tls ? "yes" : "no", "cacertdir" : Ldap::tls_cacertdir, "cacertfile" : Ldap::tls_cacertfile @@ -552,7 +571,6 @@ map args = $[ "hostname" : Ldap::GetFirstServer (server), "port" : Ldap::GetFirstPort (server), - "version" : Ldap::ldap_v2 ? 2 : 3, "use_tls" : ldap_tls ? "yes" : "no", "cacertdir" : Ldap::tls_cacertdir, "cacertfile" : Ldap::tls_cacertfile @@ -679,13 +697,7 @@ "), "member") + - _("<p>If secure connection requires certificate checking, specify where your\ncertificate file is located. Enter either a directory containing certificates\nor the explicit path to one certificate file.</p>") + - - // help text 7/9 - _("<p>Normally, the LDAP version 3 protocol is used. If you have -an LDAP server using protocol 2 (for example, OpenLDAP v1), activate -<b>LDAP Version 2</b>.</p> -"), + _("<p>If secure connection requires certificate checking, specify where your\ncertificate file is located. Enter either a directory containing certificates\nor the explicit path to one certificate file.</p>"), `admin : @@ -746,7 +758,6 @@ string nss_base_shadow = Ldap::nss_base_shadow; string nss_base_group = Ldap::nss_base_group; string pam_password = Ldap::pam_password; - boolean ldap_v2 = Ldap::ldap_v2; string tls_cacertdir = Ldap::tls_cacertdir; string tls_cacertfile = Ldap::tls_cacertfile; string krb5_realm = Ldap::krb5_realm; @@ -985,9 +996,7 @@ `PushButton (`id(`br_tls_cacertfile), _("Brows&e")) ) )) - ), - `VSpacing(0.2), - `Left (`CheckBox (`id(`ldapv), _("LDAP &Version 2"), ldap_v2)) + ) ), `HSpacing (5))); UI::ReplaceWidget (`tabContents, cont); @@ -1120,7 +1129,6 @@ tls_cacertfile = (string) UI::QueryWidget(`id(`tls_cacertfile), `Value); tls_cacertdir = (string) UI::QueryWidget(`id(`tls_cacertdir), `Value); - ldap_v2 = (boolean) UI::QueryWidget(`id(`ldapv), `Value); } if (current == `admin) { @@ -1160,7 +1168,6 @@ LdapPopup::InitAndBrowseTree (base_dn, $[ "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 @@ -1236,7 +1243,6 @@ string suf = LdapPopup::InitAndBrowseTree (base_dn, $[ "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 @@ -1368,7 +1374,6 @@ Ldap::nss_base_passwd != nss_base_passwd || Ldap::nss_base_group != nss_base_group || Ldap::nss_base_shadow != nss_base_shadow || - Ldap::ldap_v2 != ldap_v2 || Ldap::tls_cacertdir != tls_cacertdir || Ldap::tls_cacertfile != tls_cacertfile || Ldap::krb5_realm != krb5_realm || @@ -1387,7 +1392,6 @@ Ldap::nss_base_passwd = nss_base_passwd; Ldap::nss_base_group = nss_base_group; Ldap::nss_base_shadow = nss_base_shadow; - Ldap::ldap_v2 = ldap_v2; Ldap::tls_cacertdir = tls_cacertdir; Ldap::tls_cacertfile = tls_cacertfile; Ldap::krb5_realm = krb5_realm; Modified: trunk/ldap-client/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/wizards.ycp?rev=67232&r1=67231&r2=67232&view=diff ============================================================================== --- trunk/ldap-client/src/wizards.ycp (original) +++ trunk/ldap-client/src/wizards.ycp Thu Jan 19 15:36:33 2012 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: include/ldap-client/wizards.ycp * Package: Configuration of ldap-client Modified: trunk/ldap-client/testsuite/tests/Export.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/testsuite/tests/Export.out?rev=67232&r1=67231&r2=67232&view=diff ============================================================================== --- trunk/ldap-client/testsuite/tests/Export.out (original) +++ trunk/ldap-client/testsuite/tests/Export.out Thu Jan 19 15:36:33 2012 @@ -2,7 +2,6 @@ Read .etc.ldap_conf.v."/etc/ldap.conf"."uri" nil Read .etc.ldap_conf.v."/etc/ldap.conf"."host" "localhost" Read .etc.ldap_conf.v."/etc/ldap.conf"."base" "dc=suse,dc=cz" -Read .etc.ldap_conf.v."/etc/ldap.conf"."ldap_version" nil Read .etc.ldap_conf.v."/etc/ldap.conf"."ssl" nil Read .etc.ldap_conf.v."/etc/ldap.conf"."tls_cacertdir" "/etc/openldap/cacerts/" Read .etc.ldap_conf.v."/etc/ldap.conf"."tls_cacertfile" nil @@ -21,4 +20,4 @@ Read .etc.krb5_conf.v."SUSE.CZ"."kdc" ["kdc.suse.cz"] Return true Dump ============================================ -Return $["base_config_dn":"", "bind_dn":"uid=manager,dc=suse,dc=cz", "create_ldap":false, "file_server":false, "krb5_kdcip":"kdc.suse.cz", "krb5_realm":"SUSE.CZ", "ldap_domain":"dc=suse,dc=cz", "ldap_server":"localhost", "ldap_tls":false, "ldap_v2":false, "login_enabled":true, "member_attribute":"member", "mkhomedir":true, "nss_base_group":"ou=group,dc=suse,dc=cz", "pam_password":"crypt", "sssd":false, "start_autofs":false, "start_ldap":true, "tls_cacertdir":"/etc/openldap/cacerts/"] +Return $["base_config_dn":"", "bind_dn":"uid=manager,dc=suse,dc=cz", "create_ldap":false, "file_server":false, "krb5_kdcip":"kdc.suse.cz", "krb5_realm":"SUSE.CZ", "ldap_domain":"dc=suse,dc=cz", "ldap_server":"localhost", "ldap_tls":false, "login_enabled":true, "member_attribute":"member", "mkhomedir":true, "nss_base_group":"ou=group,dc=suse,dc=cz", "pam_password":"crypt", "sssd":false, "start_autofs":false, "start_ldap":true, "tls_cacertdir":"/etc/openldap/cacerts/"] Modified: trunk/ldap-client/testsuite/tests/Export2.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/testsuite/tests/Export2.out?rev=67232&r1=67231&r2=67232&view=diff ============================================================================== --- trunk/ldap-client/testsuite/tests/Export2.out (original) +++ trunk/ldap-client/testsuite/tests/Export2.out Thu Jan 19 15:36:33 2012 @@ -1,7 +1,6 @@ Read .etc.ldap_conf.v."/etc/ldap.conf"."uri" nil Read .etc.ldap_conf.v."/etc/ldap.conf"."host" "localhost" Read .etc.ldap_conf.v."/etc/ldap.conf"."base" "dc=suse,dc=cz" -Read .etc.ldap_conf.v."/etc/ldap.conf"."ldap_version" nil Read .etc.ldap_conf.v."/etc/ldap.conf"."ssl" nil Read .etc.ldap_conf.v."/etc/ldap.conf"."tls_cacertdir" "/etc/openldap/cacerts/" Read .etc.ldap_conf.v."/etc/ldap.conf"."tls_cacertfile" nil @@ -24,4 +23,4 @@ Read .etc.sssd_conf.v."domain/default"."cache_credentials" "true" Read .etc.sssd_conf.v."domain/default"."enumerate" "true" Return true -Return $["base_config_dn":"", "bind_dn":"uid=manager,dc=suse,dc=cz", "create_ldap":false, "file_server":false, "krb5_kdcip":"kdc.suse.cz", "krb5_realm":"SUSE.CZ", "ldap_domain":"dc=suse,dc=cz", "ldap_server":"localhost", "ldap_tls":false, "ldap_v2":false, "login_enabled":true, "member_attribute":"member", "mkhomedir":true, "nss_base_group":"ou=group,dc=suse,dc=cz", "pam_password":"crypt", "sssd":true, "sssd_cache_credentials":true, "sssd_enumerate":true, "sssd_ldap_schema":"rfc2307", "start_autofs":true, "start_ldap":true, "tls_cacertdir":"/etc/openldap/cacerts/"] +Return $["base_config_dn":"", "bind_dn":"uid=manager,dc=suse,dc=cz", "create_ldap":false, "file_server":false, "krb5_kdcip":"kdc.suse.cz", "krb5_realm":"SUSE.CZ", "ldap_domain":"dc=suse,dc=cz", "ldap_server":"localhost", "ldap_tls":false, "login_enabled":true, "member_attribute":"member", "mkhomedir":true, "nss_base_group":"ou=group,dc=suse,dc=cz", "pam_password":"crypt", "sssd":true, "sssd_cache_credentials":true, "sssd_enumerate":true, "sssd_ldap_schema":"rfc2307", "start_autofs":true, "start_ldap":true, "tls_cacertdir":"/etc/openldap/cacerts/"] Modified: trunk/ldap-client/testsuite/tests/Export3.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/testsuite/tests/Export3.out?rev=67232&r1=67231&r2=67232&view=diff ============================================================================== --- trunk/ldap-client/testsuite/tests/Export3.out (original) +++ trunk/ldap-client/testsuite/tests/Export3.out Thu Jan 19 15:36:33 2012 @@ -1,7 +1,6 @@ Read .etc.ldap_conf.v."/etc/ldap.conf"."uri" nil Read .etc.ldap_conf.v."/etc/ldap.conf"."host" "localhost" Read .etc.ldap_conf.v."/etc/ldap.conf"."base" "dc=suse,dc=cz" -Read .etc.ldap_conf.v."/etc/ldap.conf"."ldap_version" nil Read .etc.ldap_conf.v."/etc/ldap.conf"."ssl" nil Read .etc.ldap_conf.v."/etc/ldap.conf"."tls_cacertdir" "/etc/openldap/cacerts/" Read .etc.ldap_conf.v."/etc/ldap.conf"."tls_cacertfile" nil @@ -24,4 +23,4 @@ Read .etc.sssd_conf.v."domain/default"."cache_credentials" "true" Read .etc.sssd_conf.v."domain/default"."enumerate" "true" Return true -Return $["base_config_dn":"", "bind_dn":"uid=manager,dc=suse,dc=cz", "create_ldap":false, "file_server":false, "krb5_kdcip":"kdc.suse.cz,kdc.suse.de", "krb5_realm":"SUSE.CZ", "ldap_domain":"dc=suse,dc=cz", "ldap_server":"localhost", "ldap_tls":false, "ldap_v2":false, "login_enabled":true, "member_attribute":"member", "mkhomedir":true, "nss_base_group":"ou=group,dc=suse,dc=cz", "pam_password":"crypt", "sssd":true, "sssd_cache_credentials":true, "sssd_enumerate":true, "sssd_ldap_schema":"rfc2307", "start_autofs":true, "start_ldap":true, "tls_cacertdir":"/etc/openldap/cacerts/"] +Return $["base_config_dn":"", "bind_dn":"uid=manager,dc=suse,dc=cz", "create_ldap":false, "file_server":false, "krb5_kdcip":"kdc.suse.cz,kdc.suse.de", "krb5_realm":"SUSE.CZ", "ldap_domain":"dc=suse,dc=cz", "ldap_server":"localhost", "ldap_tls":false, "login_enabled":true, "member_attribute":"member", "mkhomedir":true, "nss_base_group":"ou=group,dc=suse,dc=cz", "pam_password":"crypt", "sssd":true, "sssd_cache_credentials":true, "sssd_enumerate":true, "sssd_ldap_schema":"rfc2307", "start_autofs":true, "start_ldap":true, "tls_cacertdir":"/etc/openldap/cacerts/"] Modified: trunk/ldap-client/testsuite/tests/LDAPInit.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/testsuite/tests/LDAPInit.out?rev=67232&r1=67231&r2=67232&view=diff ============================================================================== --- trunk/ldap-client/testsuite/tests/LDAPInit.out (original) +++ trunk/ldap-client/testsuite/tests/LDAPInit.out Thu Jan 19 15:36:33 2012 @@ -1,16 +1,16 @@ Dump ==== init (one server, no port set) ============== Dump ==== value of server: "localhost" -Execute .ldap $["cacertdir":"", "cacertfile":"", "hostname":"localhost", "port":389, "use_tls":"no", "version":3] true +Execute .ldap $["cacertdir":"", "cacertfile":"", "hostname":"localhost", "port":389, "use_tls":"no"] true Return Dump ==== init (one server, nonsence port set) ======== Dump ==== value of server: "localhost:sdgfd#$" -Execute .ldap $["cacertdir":"", "cacertfile":"", "hostname":"localhost", "port":389, "use_tls":"no", "version":3] true +Execute .ldap $["cacertdir":"", "cacertfile":"", "hostname":"localhost", "port":389, "use_tls":"no"] true Return Dump ==== init (more servers set, TLS used) =========== Dump ==== value of server: "chimera.suse.cz:333 localhost" -Execute .ldap $["cacertdir":"/etc/ssl/certs", "cacertfile":"", "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"] true Return Dump ==== init failed ================================= -Execute .ldap $["cacertdir":"/etc/ssl/certs", "cacertfile":"", "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"] 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=67232&r1=67231&r2=67232&view=diff ============================================================================== --- trunk/ldap-client/testsuite/tests/LDAPInit.ycp (original) +++ trunk/ldap-client/testsuite/tests/LDAPInit.ycp Thu Jan 19 15:36:33 2012 @@ -47,7 +47,6 @@ DUMP ("==== init (more servers set, TLS used) ==========="); Ldap::server = "chimera.suse.cz:333 localhost"; - Ldap::ldap_v2 = true; Ldap::ldap_tls = true; Ldap::tls_cacertdir = "/etc/ssl/certs"; Modified: trunk/ldap-client/testsuite/tests/Read.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/testsuite/tests/Read.out?rev=67232&r1=67231&r2=67232&view=diff ============================================================================== --- trunk/ldap-client/testsuite/tests/Read.out (original) +++ trunk/ldap-client/testsuite/tests/Read.out Thu Jan 19 15:36:33 2012 @@ -1,7 +1,6 @@ Dump ==== reading... ============================ Read .etc.ldap_conf.v."/etc/ldap.conf"."uri" "ldap://localhost:333" Read .etc.ldap_conf.v."/etc/ldap.conf"."base" "dc=suse,dc=cz" -Read .etc.ldap_conf.v."/etc/ldap.conf"."ldap_version" nil Read .etc.ldap_conf.v."/etc/ldap.conf"."ssl" nil Read .etc.ldap_conf.v."/etc/ldap.conf"."tls_cacertdir" "/etc/openldap/cacerts/" Read .etc.ldap_conf.v."/etc/ldap.conf"."tls_cacertfile" nil Modified: trunk/ldap-client/testsuite/tests/Read2.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/testsuite/tests/Read2.out?rev=67232&r1=67231&r2=67232&view=diff ============================================================================== --- trunk/ldap-client/testsuite/tests/Read2.out (original) +++ trunk/ldap-client/testsuite/tests/Read2.out Thu Jan 19 15:36:33 2012 @@ -1,6 +1,5 @@ Read .etc.ldap_conf.v."/etc/ldap.conf"."uri" "ldap://localhost:333" Read .etc.ldap_conf.v."/etc/ldap.conf"."base" "dc=suse,dc=cz" -Read .etc.ldap_conf.v."/etc/ldap.conf"."ldap_version" nil Read .etc.ldap_conf.v."/etc/ldap.conf"."ssl" nil Read .etc.ldap_conf.v."/etc/ldap.conf"."tls_cacertdir" "/etc/openldap/cacerts/" Read .etc.ldap_conf.v."/etc/ldap.conf"."tls_cacertfile" nil Modified: trunk/ldap-client/yast2-ldap-client.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/yast2-ldap-client.spec.in?rev=67232&r1=67231&r2=67232&view=diff ============================================================================== --- trunk/ldap-client/yast2-ldap-client.spec.in (original) +++ trunk/ldap-client/yast2-ldap-client.spec.in Thu Jan 19 15:36:33 2012 @@ -2,8 +2,8 @@ @HEADER@ -Group: System/YaST -License: GPL-2.0+ +Group: System/YaST +License: GPL-2.0 BuildRequires: doxygen perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-pam yast2-testsuite yast2-network PreReq: %fillup_prereq -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org