Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

- removed obsolete version 2 reference (fate#313143)

- confirmed license
- 2.22.2


svn path=/trunk/ldap-client/; revision=67232
  • Loading branch information...
commit 39b563dba6aac24b05fd76c40c04bd1df4988041 1 parent 3a0392f
@jsuchome jsuchome authored
View
2  VERSION
@@ -1 +1 @@
-2.22.1
+2.22.2
View
7 package/yast2-ldap-client.changes
@@ -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)
View
34 src/Ldap.ycp
@@ -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 @@ Verify that the Server has StartTLS support enabled."),
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 @@ Verify that the Server has StartTLS support enabled."),
"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 @@ Verify that the Server has StartTLS support enabled."),
// 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 @@ Verify that the Server has StartTLS support enabled."),
}
}
- 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 @@ Verify that the Server has StartTLS support enabled."),
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 @@ Retry connection without TLS/SSL?
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 @@ Select another one.
WriteOpenLdapConf();
- if (ldap_v2)
- WriteLdapConfEntry ("ldap_version", "2");
- else
- WriteLdapConfEntry ("ldap_version", "3");
-
if (ldap_tls)
WriteLdapConfEntry ("ssl", "start_tls");
else
View
21 src/LdapPopup.ycp
@@ -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 @@ import "Wizard";
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
View
20 src/ldap-client.ycp
@@ -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 <jsuchome@suse.cz>
* Summary: Just a redirection
View
20 src/ldap.ycp
@@ -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
View
20 src/ldap_auto.ycp
@@ -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
View
20 src/ldap_browser.ycp
@@ -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
View
2  src/ldap_client.rnc
@@ -9,7 +9,6 @@ ldap = element ldap {
ldap_domain? &
ldap_server? &
ldap_tls? &
- ldap_v2? &
create_ldap? &
start_ldap? &
member_attribute? &
@@ -33,7 +32,6 @@ login_enabled = element login_enabled { BOOLEAN }
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 }
View
20 src/ldap_config.ycp
@@ -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
View
20 src/routines.ycp
@@ -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
View
40 src/ui.ycp
@@ -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 @@ want to use it, it will be installed automatically.</p>
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 @@ you cannot retrieve data with NIS. Really use LDAP instead of NIS?
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 @@ The default value for <b>Group Member Attribute</b> is <i>%1</i>.</p>
"),
"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 @@ add a new password policy. Password policies must be enabled on the LDAP server.
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 @@ add a new password policy. Password policies must be enabled on the LDAP server.
`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 @@ add a new password policy. Password policies must be enabled on the LDAP server.
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 @@ add a new password policy. Password policies must be enabled on the LDAP server.
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 @@ add a new password policy. Password policies must be enabled on the LDAP server.
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 @@ Please select another one."), new_dn));
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 @@ Please select another one."), new_dn));
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;
View
20 src/wizards.ycp
@@ -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
View
3  testsuite/tests/Export.out
@@ -2,7 +2,6 @@ Dump ==== reading... ============================
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.libdefaults.default_realm ["SUSE.CZ"]
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/"]
View
3  testsuite/tests/Export2.out
@@ -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"."ldap_schema" "rfc2307"
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/"]
View
3  testsuite/tests/Export3.out
@@ -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"."ldap_schema" "rfc2307"
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/"]
View
8 testsuite/tests/LDAPInit.out
@@ -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
View
1  testsuite/tests/LDAPInit.ycp
@@ -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";
View
1  testsuite/tests/Read.out
@@ -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
View
1  testsuite/tests/Read2.out
@@ -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
View
4 yast2-ldap-client.spec.in
@@ -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
Please sign in to comment.
Something went wrong with that request. Please try again.