Hello community, here is the log from the commit of package yast2-ldap-client for openSUSE:Factory checked in at 2013-11-23 08:20:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-ldap-client (Old) and /work/SRC/openSUSE:Factory/.yast2-ldap-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-ldap-client" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-ldap-client/yast2-ldap-client.changes 2013-10-25 18:55:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-ldap-client.new/yast2-ldap-client.changes 2013-11-23 08:20:59.000000000 +0100 @@ -1,0 +2,19 @@ +Fri Nov 22 13:26:14 CET 2013 - [email protected] + +- do not change nscd cache value for OES (bnc#848051) + +------------------------------------------------------------------- +Fri Nov 22 10:16:56 CET 2013 - [email protected] + +- revoked fix for bnc#708562: do not base sssd state on current + configuration when it should be default (bnc#847492) +- 3.1.3 + +------------------------------------------------------------------- +Tue Nov 19 15:02:19 CET 2013 - [email protected] + +- replace obsolete krb5_kdcip key with krb5_server (bnc#851048) + (new autoYaST profile not usable for releases using the old key) +- 3.1.2 + +------------------------------------------------------------------- Old: ---- yast2-ldap-client-3.1.1.tar.bz2 New: ---- yast2-ldap-client-3.1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ldap-client.spec ++++++ --- /var/tmp/diff_new_pack.tzxSCB/_old 2013-11-23 08:21:00.000000000 +0100 +++ /var/tmp/diff_new_pack.tzxSCB/_new 2013-11-23 08:21:00.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-ldap-client -Version: 3.1.1 +Version: 3.1.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-ldap-client-3.1.1.tar.bz2 -> yast2-ldap-client-3.1.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-3.1.1/CONTRIBUTING.md new/yast2-ldap-client-3.1.3/CONTRIBUTING.md --- old/yast2-ldap-client-3.1.1/CONTRIBUTING.md 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-ldap-client-3.1.3/CONTRIBUTING.md 2013-11-22 13:55:03.000000000 +0100 @@ -0,0 +1,87 @@ +YaST Contribution Guidelines +============================ + +YaST is an open source project and as such it welcomes all kinds of +contributions. If you decide to contribute, please follow these guidelines to +ensure the process is effective and pleasant both for you and YaST maintainers. + +There are two main forms of contribution: reporting bugs and performing code +changes. + +Bug Reports +----------- + +If you find a problem, please report it either using +[Bugzilla](https://bugzilla.novell.com/enter_bug.cgi?format=guided&product=openSUSE+Factory&component=YaST2) +or [GitHub issues](../../issues). (For Bugzilla, use the [simplified +registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount.jsp) +if you don't have an account yet.) + +If you find a problem, please report it either using +[Bugzilla](https://bugzilla.novell.com/) or GitHub issues. We can't guarantee +that every bug will be fixed, but we'll try. + +When creating a bug report, please follow our [bug reporting +guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug). + +Code Changes +------------ + +We welcome all kinds of code contributions, from simple bug fixes to significant +refactorings and implementation of new features. However, before making any +non-trivial contribution, get in touch with us first — this can prevent wasted +effort on both sides. Also, have a look at our [development +documentation](http://en.opensuse.org/openSUSE:YaST_development). + +To send us your code change, use GitHub pull requests. The workflow is as +follows: + + 1. Fork the project. + + 2. Create a topic branch based on `master`. + + 3. Implement your change, including tests (if possible). Make sure you adhere + to the [Ruby style + guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md). + + 4. Make sure your change didn't break anything by building the RPM package + (`rake osc:build`). The build process includes running the full testsuite. + + 5. Publish the branch and create a pull request. + + 6. YaST developers will review your change and possibly point out issues. + Adapt the code under their guidance until they are all resolved. + + 7. Finally, the pull request will get merged or rejected. + +See also [GitHub's guide on +contributing](https://help.github.com/articles/fork-a-repo). + +If you want to do multiple unrelated changes, use separate branches and pull +requests. + +Do not change the `VERSION` and `*.changes` files as this could lead to +conflicts. + +### Commits + +Each commit in the pull request should do only one thing, which is clearly +described by its commit message. Especially avoid mixing formatting changes and +functional changes into one commit. When writing commit messages, adhere to +[widely used +conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html). + +If your commit is related to a bug in Buzgilla or an issue on GitHub, make sure +you mention it in the commit message for cross-reference. Use format like +bnc#775814 or gh#yast/yast-foo#42. See also [GitHub +autolinking](https://help.github.com/articles/github-flavored-markdown#references) +and [openSUSE abbreviation +reference](http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines#Current_set_of_abbreviations). + +Additional Information +---------------------- + +If you have any question, feel free to ask at the [development mailing +list](http://lists.opensuse.org/yast-devel/) or at the +[#yast](http://webchat.freenode.net/?channels=%23yast) IRC channel on freenode. +We'll do our best to provide a timely and accurate answer. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-3.1.1/VERSION new/yast2-ldap-client-3.1.3/VERSION --- old/yast2-ldap-client-3.1.1/VERSION 2013-10-23 14:35:30.000000000 +0200 +++ new/yast2-ldap-client-3.1.3/VERSION 2013-11-22 13:55:03.000000000 +0100 @@ -1 +1 @@ -3.1.1 +3.1.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-3.1.1/package/yast2-ldap-client.changes new/yast2-ldap-client-3.1.3/package/yast2-ldap-client.changes --- old/yast2-ldap-client-3.1.1/package/yast2-ldap-client.changes 2013-10-23 14:35:30.000000000 +0200 +++ new/yast2-ldap-client-3.1.3/package/yast2-ldap-client.changes 2013-11-22 13:55:03.000000000 +0100 @@ -1,4 +1,23 @@ ------------------------------------------------------------------- +Fri Nov 22 13:26:14 CET 2013 - [email protected] + +- do not change nscd cache value for OES (bnc#848051) + +------------------------------------------------------------------- +Fri Nov 22 10:16:56 CET 2013 - [email protected] + +- revoked fix for bnc#708562: do not base sssd state on current + configuration when it should be default (bnc#847492) +- 3.1.3 + +------------------------------------------------------------------- +Tue Nov 19 15:02:19 CET 2013 - [email protected] + +- replace obsolete krb5_kdcip key with krb5_server (bnc#851048) + (new autoYaST profile not usable for releases using the old key) +- 3.1.2 + +------------------------------------------------------------------- Wed Oct 23 09:39:33 UTC 2013 - [email protected] - Use sssd for LDAP based automount maps (fate#313275) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-3.1.1/src/autoyast-rnc/ldap_client.rnc new/yast2-ldap-client-3.1.3/src/autoyast-rnc/ldap_client.rnc --- old/yast2-ldap-client-3.1.1/src/autoyast-rnc/ldap_client.rnc 2013-10-23 14:35:30.000000000 +0200 +++ new/yast2-ldap-client-3.1.3/src/autoyast-rnc/ldap_client.rnc 2013-11-22 13:55:03.000000000 +0100 @@ -18,6 +18,12 @@ pam_password? & start_autofs? & sssd? & + sssd_ldap_schema? & + sssd_enumerate? & + sssd_cache_credentials? & + sssd_with_krb? & + krb5_realm? & + krb5_server? & mkhomedir? & tls_cacertdir? & tls_cacertfile? & @@ -42,4 +48,9 @@ sssd = element sssd { BOOLEAN } mkhomedir = element mkhomedir { BOOLEAN } start_autofs = element start_autofs { BOOLEAN } - +sssd_ldap_schema = element sssd_ldap_schema { text } +sssd_enumerate = element sssd_enumerate { BOOLEAN } +sssd_cache_credentials = element sssd_cache_credentials { BOOLEAN } +sssd_with_krb = element sssd_with_krb { BOOLEAN } +krb5_realm = element krb5_realm { text } +krb5_server = element krb5_server { text } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-3.1.1/src/clients/ldap.rb new/yast2-ldap-client-3.1.3/src/clients/ldap.rb --- old/yast2-ldap-client-3.1.1/src/clients/ldap.rb 2013-10-23 14:35:30.000000000 +0200 +++ new/yast2-ldap-client-3.1.3/src/clients/ldap.rb 2013-11-22 13:55:03.000000000 +0100 @@ -297,13 +297,13 @@ end if Ops.get(options, "kdc", "") != "" kdc = Ops.get(options, "kdc", "") - if Ldap.krb5_kdcip != kdc - Ldap.krb5_kdcip = kdc + if Ldap.krb5_server != kdc + Ldap.krb5_server = kdc Ldap.modified = true end end - if Ldap.krb5_kdcip != "" && Ldap.krb5_realm != "" + if Ldap.krb5_server != "" && Ldap.krb5_realm != "" Ldap.sssd_with_krb = true end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-3.1.1/src/include/ldap/ui.rb new/yast2-ldap-client-3.1.3/src/include/ldap/ui.rb --- old/yast2-ldap-client-3.1.1/src/include/ldap/ui.rb 2013-10-23 14:35:30.000000000 +0200 +++ new/yast2-ldap-client-3.1.3/src/include/ldap/ui.rb 2013-11-22 13:55:03.000000000 +0100 @@ -941,7 +941,7 @@ append_base = bind_dn != "" && Builtins.issubstring(bind_dn, base_dn) pam_password = Ldap.pam_password krb5_realm = Ldap.krb5_realm - krb5_kdcip = Ldap.krb5_kdcip + krb5_server = Ldap.krb5_server sssd_with_krb = Ldap.sssd_with_krb sssd_ldap_schema = Ldap.sssd_ldap_schema sssd_enumerate = Ldap.sssd_enumerate @@ -1110,7 +1110,7 @@ # textentry label TextEntry(Id(:krb5_realm), _("Default Real&m"), krb5_realm), # textentry label - TextEntry(Id(:krb5_kdcip), _("&KDC Server Address"), krb5_kdcip) + TextEntry(Id(:krb5_server), _("&KDC Server Address"), krb5_server) ), VSpacing(), # combobox label @@ -1170,7 +1170,7 @@ UI.ChangeWidget(Id(:tabs), :CurrentItem, :client) if has_tabs if Ldap.sssd UI.ChangeWidget(Id(:krb5_realm), :Enabled, sssd_with_krb) - UI.ChangeWidget(Id(:krb5_kdcip), :Enabled, sssd_with_krb) + UI.ChangeWidget(Id(:krb5_server), :Enabled, sssd_with_krb) end nil @@ -1273,8 +1273,8 @@ krb5_realm = Convert.to_string( UI.QueryWidget(Id(:krb5_realm), :Value) ) - krb5_kdcip = Convert.to_string( - UI.QueryWidget(Id(:krb5_kdcip), :Value) + krb5_server = Convert.to_string( + UI.QueryWidget(Id(:krb5_server), :Value) ) sssd_cache_credentials = Convert.to_boolean( UI.QueryWidget(Id(:sssd_cache_credentials), :Value) @@ -1354,7 +1354,7 @@ UI.QueryWidget(Id(:sssd_with_krb), :Value) ) UI.ChangeWidget(Id(:krb5_realm), :Enabled, sssd_with_krb) - UI.ChangeWidget(Id(:krb5_kdcip), :Enabled, sssd_with_krb) + UI.ChangeWidget(Id(:krb5_server), :Enabled, sssd_with_krb) end if result == :next || result == :configure @@ -1371,7 +1371,7 @@ UI.SetFocus(Id(:base_config_dn)) next end - if krb5_realm == "" || krb5_kdcip == "" || !Ldap.sssd + if krb5_realm == "" || krb5_server == "" || !Ldap.sssd sssd_with_krb = false end @@ -1383,7 +1383,7 @@ Ldap.nss_base_group != nss_base_group || Ldap.nss_base_automount != nss_base_automount || Ldap.krb5_realm != krb5_realm || - Ldap.krb5_kdcip != krb5_kdcip || + Ldap.krb5_server != krb5_server || Ldap.sssd_cache_credentials != sssd_cache_credentials || Ldap.sssd_enumerate != sssd_enumerate || Ldap.sssd_ldap_schema != sssd_ldap_schema @@ -1396,7 +1396,7 @@ Ldap.nss_base_group = nss_base_group Ldap.nss_base_automount = nss_base_automount Ldap.krb5_realm = krb5_realm - Ldap.krb5_kdcip = krb5_kdcip + Ldap.krb5_server = krb5_server Ldap.sssd_with_krb = sssd_with_krb Ldap.sssd_cache_credentials = sssd_cache_credentials Ldap.sssd_enumerate = sssd_enumerate diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-3.1.1/src/modules/Ldap.rb new/yast2-ldap-client-3.1.3/src/modules/Ldap.rb --- old/yast2-ldap-client-3.1.1/src/modules/Ldap.rb 2013-10-23 14:35:30.000000000 +0200 +++ new/yast2-ldap-client-3.1.3/src/modules/Ldap.rb 2013-11-22 13:55:03.000000000 +0100 @@ -297,7 +297,7 @@ @krb5_realm = "" # adress of KDC (key distribution centre) server for default realm - @krb5_kdcip = "" + @krb5_server = "" # ldap_schema argument of /etc/sssd/sssd.conf @sssd_ldap_schema = "rfc2307bis" @@ -405,64 +405,46 @@ # Only set variables, without checking anything # @return [void] def Set(settings) - settings = deep_copy(settings) - @start = Ops.get_boolean(settings, "start_ldap", false) - @server = Ops.get_string(settings, "ldap_server", "") - # leaving "ldap_domain" for backward compatibility - @base_dn = Ops.get_string(settings, "ldap_domain", "") - @ldap_tls = Ops.get_boolean(settings, "ldap_tls", false) - @pam_password = Ops.get_string(settings, "pam_password", "exop") - @bind_dn = Ops.get_string(settings, "bind_dn", "") - @file_server = Ops.get_boolean(settings, "file_server", false) - @base_config_dn = Ops.get_string(settings, "base_config_dn", "") - @nss_base_passwd = Ops.get_string(settings, "nss_base_passwd", "") - @nss_base_shadow = Ops.get_string(settings, "nss_base_passwd", "") - @nss_base_group = Ops.get_string(settings, "nss_base_group", "") - @nss_base_automount = Ops.get_string(settings, "nss_base_automount", "") - @member_attribute = Ops.get_string(settings, "member_attribute", "member") - @create_ldap = Ops.get_boolean(settings, "create_ldap", false) - @login_enabled = Ops.get_boolean(settings, "login_enabled", true) - @_start_autofs = Ops.get_boolean(settings, "start_autofs", false) - @tls_cacertdir = Ops.get_string(settings, "tls_cacertdir", "") - @tls_cacertfile = Ops.get_string(settings, "tls_cacertfile", "") - @tls_checkpeer = Ops.get_string(settings, "tls_checkpeer", "yes") - @mkhomedir = Ops.get_boolean(settings, "mkhomedir", @mkhomedir) - @sssd = Ops.get_boolean(settings, "sssd", @sssd) - @sssd_ldap_schema = Ops.get_string( - settings, - "sssd_ldap_schema", - @sssd_ldap_schema - ) - @sssd_enumerate = Ops.get_boolean( - settings, - "sssd_enumerate", - @sssd_enumerate - ) - @sssd_cache_credentials = Ops.get_boolean( - settings, - "sssd_cache_credentials", - @sssd_cache_credentials - ) - @sssd_with_krb = Ops.get_boolean( - settings, - "sssd_with_krb", - @sssd_with_krb - ) - @krb5_realm = Ops.get_string(settings, "krb5_realm", @krb5_realm) - @krb5_kdcip = Ops.get_string(settings, "krb5_kdcip", @krb5_kdcip) - if @_start_autofs - @required_packages = Convert.convert( - Builtins.union(@required_packages, ["autofs"]), - :from => "list", - :to => "list <string>" - ) - end - @old_base_dn = @base_dn - @old_server = @server - @old_member_attribute = @member_attribute - @modified = true - @openldap_modified = true + @start = settings.fetch("start_ldap", false) + @ldap_tls = settings.fetch("ldap_tls", false) + @login_enabled = settings.fetch("login_enabled", true) + @_start_autofs = settings.fetch("start_autofs", false) + @file_server = settings.fetch("file_server", false) + @create_ldap = settings.fetch("create_ldap", false) + @mkhomedir = settings.fetch("mkhomedir", @mkhomedir) + @sssd = settings.fetch("sssd", @sssd) + @sssd_enumerate = settings.fetch("sssd_enumerate", @sssd_enumerate) + @sssd_cache_credentials = settings.fetch("sssd_cache_credentials", @sssd_cache_credentials) + @sssd_with_krb = settings.fetch("sssd_with_krb", @sssd_with_krb) + + @server = settings["ldap_server"] || "" + # leaving "ldap_domain" for backward compatibility + @base_dn = settings["ldap_domain"] || "" + @pam_password = settings["pam_password"] || "exop" + @bind_dn = settings["bind_dn"] || "" + @base_config_dn = settings["base_config_dn"] || "" + @nss_base_passwd = settings["nss_base_passwd"] || "" + @nss_base_shadow = settings["nss_base_shadow"] || "" + @nss_base_group = settings["nss_base_group"] || "" + @nss_base_automount = settings["nss_base_automount"] || "" + @member_attribute = settings["member_attribute"] || "member" + @tls_cacertdir = settings["tls_cacertdir"] || "" + @tls_cacertfile = settings["tls_cacertfile"] || "" + @tls_checkpeer = settings["tls_checkpeer"] || "yes" + @sssd_ldap_schema = settings["sssd_ldap_schema"] || @sssd_ldap_schema + @krb5_realm = settings["krb5_realm"] || @krb5_realm + + # krb5_kdcip is obsoleted key - check for it if the profile is not new enough + @krb5_server = settings["krb5_server"] || settings["krb5_kdcip"] || @krb5_server + + @required_packages.push("autofs") if @_start_autofs + + @old_base_dn = @base_dn + @old_server = @server + @old_member_attribute = @member_attribute + @modified = true + @openldap_modified = true nil end @@ -513,7 +495,7 @@ end Ops.set(e, "start_autofs", @_start_autofs) if @_autofs_allowed Ops.set(e, "krb5_realm", @krb5_realm) if @krb5_realm != "" - Ops.set(e, "krb5_kdcip", @krb5_kdcip) if @krb5_kdcip != "" + Ops.set(e, "krb5_server", @krb5_server) if @krb5_server != "" if @sssd_ldap_schema != "rfc2307bis" Ops.set(e, "sssd_ldap_schema", @sssd_ldap_schema) end @@ -642,7 +624,7 @@ :to => "list <string>" ) kdcs = [] if kdcs == nil - @krb5_kdcip = Builtins.mergestring(kdcs, ",") + @krb5_server = Builtins.mergestring(kdcs, ",") true end @@ -799,8 +781,7 @@ @sssd = false else # ... or as 'sssd' - @sssd = Builtins.contains(Ops.get_list(@nsswitch, "passwd", []), "sss") - @start = @sssd + @start = Builtins.contains(Ops.get_list(@nsswitch, "passwd", []), "sss") end # nothing is configured, but some packages are installed @@ -984,8 +965,8 @@ domain = Builtins.add(path(".etc.sssd_conf.v"), "domain/default") realm = Convert.to_string(SCR.Read(Builtins.add(domain, "krb5_realm"))) @krb5_realm = realm if realm != nil - kdc = Convert.to_string(SCR.Read(Builtins.add(domain, "krb5_kdcip"))) - @krb5_kdcip = kdc if kdc != nil + kdc = Convert.to_string(SCR.Read(Builtins.add(domain, "krb5_server"))) + @krb5_server = kdc if kdc != nil schema = Convert.to_string( SCR.Read(Builtins.add(domain, "ldap_schema")) ) @@ -1026,7 +1007,7 @@ ) @nss_base_automount = autofs_base if autofs_base != nil end - @sssd_with_krb = true if @krb5_realm != "" && @krb5_kdcip != "" + @sssd_with_krb = true if @krb5_realm != "" && @krb5_server != "" # Now check if previous configuration of LDAP server didn't proposed # some better values: @@ -2429,7 +2410,7 @@ SCR.Write(Builtins.add(domain, "chpass_provider"), "krb5") SCR.Write(Builtins.add(domain, "krb5_realm"), @krb5_realm) - SCR.Write(Builtins.add(domain, "krb5_kdcip"), @krb5_kdcip) + SCR.Write(Builtins.add(domain, "krb5_server"), @krb5_server) else SCR.Write(Builtins.add(domain, "chpass_provider"), "ldap") SCR.Write(Builtins.add(domain, "auth_provider"), "ldap") @@ -2951,7 +2932,7 @@ "tls_checkpeer", @tls_checkpeer == "yes" ? nil : @tls_checkpeer ) - WriteNscdCache(@start && @sssd) + WriteNscdCache(@start && @sssd) unless oes end if @start # ldap used for authentication # ---------- correct pam_password value for Novell eDirectory @@ -3438,7 +3419,7 @@ publish :variable => :sssd_cache_credentials, :type => "boolean" publish :variable => :sssd_with_krb, :type => "boolean" publish :variable => :krb5_realm, :type => "string" - publish :variable => :krb5_kdcip, :type => "string" + publish :variable => :krb5_server, :type => "string" publish :variable => :sssd_ldap_schema, :type => "string" publish :variable => :sssd_enumerate, :type => "boolean" publish :variable => :ldap_error_hints, :type => "map" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-3.1.1/testsuite/tests/Export.out new/yast2-ldap-client-3.1.3/testsuite/tests/Export.out --- old/yast2-ldap-client-3.1.1/testsuite/tests/Export.out 2013-10-23 14:35:30.000000000 +0200 +++ new/yast2-ldap-client-3.1.3/testsuite/tests/Export.out 2013-11-22 13:55:03.000000000 +0100 @@ -21,4 +21,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, "login_enabled":true, "member_attribute":"member", "mkhomedir":true, "nss_base_group":"ou=group,dc=suse,dc=cz", "pam_password":"crypt", "sssd":false, "sssd_with_krb":true, "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_realm":"SUSE.CZ", "krb5_server":"kdc.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, "sssd_with_krb":true, "start_autofs":false, "start_ldap":true, "tls_cacertdir":"/etc/openldap/cacerts/"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-3.1.1/testsuite/tests/Export2.out new/yast2-ldap-client-3.1.3/testsuite/tests/Export2.out --- old/yast2-ldap-client-3.1.1/testsuite/tests/Export2.out 2013-10-23 14:35:30.000000000 +0200 +++ new/yast2-ldap-client-3.1.3/testsuite/tests/Export2.out 2013-11-22 13:55:03.000000000 +0100 @@ -19,7 +19,7 @@ Read .etc.krb5_conf.v.libdefaults.default_realm ["SUSE.CZ"] Read .etc.krb5_conf.v."SUSE.CZ"."kdc" ["kdc.suse.cz"] Read .etc.sssd_conf.v."domain/default"."krb5_realm" "SUSE.CZ" -Read .etc.sssd_conf.v."domain/default"."krb5_kdcip" "kdc.suse.cz" +Read .etc.sssd_conf.v."domain/default"."krb5_server" "kdc.suse.cz" 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" @@ -28,4 +28,4 @@ Read .etc.sssd_conf.v."domain/default"."ldap_group_search_base" nil Read .etc.sssd_conf.v."domain/default"."ldap_autofs_search_base" nil 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":true, "login_enabled":true, "member_attribute":"member", "mkhomedir":true, "nss_base_group":"ou=group,dc=suse,dc=cz", "nss_base_passwd":"ou=users,dc=suse,dc=cz", "pam_password":"crypt", "sssd":true, "sssd_cache_credentials":true, "sssd_enumerate":true, "sssd_ldap_schema":"rfc2307", "sssd_with_krb":true, "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_realm":"SUSE.CZ", "krb5_server":"kdc.suse.cz", "ldap_domain":"dc=suse,dc=cz", "ldap_server":"localhost", "ldap_tls":true, "login_enabled":true, "member_attribute":"member", "mkhomedir":true, "nss_base_group":"ou=group,dc=suse,dc=cz", "nss_base_passwd":"ou=users,dc=suse,dc=cz", "pam_password":"crypt", "sssd":true, "sssd_cache_credentials":true, "sssd_enumerate":true, "sssd_ldap_schema":"rfc2307", "sssd_with_krb":true, "start_autofs":true, "start_ldap":true, "tls_cacertdir":"/etc/openldap/cacerts/"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-3.1.1/testsuite/tests/Export2.rb new/yast2-ldap-client-3.1.3/testsuite/tests/Export2.rb --- old/yast2-ldap-client-3.1.1/testsuite/tests/Export2.rb 2013-10-23 14:35:30.000000000 +0200 +++ new/yast2-ldap-client-3.1.3/testsuite/tests/Export2.rb 2013-11-22 13:55:03.000000000 +0100 @@ -52,7 +52,7 @@ "v" => { "domain/default" => { "krb5_realm" => "SUSE.CZ", - "krb5_kdcip" => "kdc.suse.cz", + "krb5_server" => "kdc.suse.cz", "ldap_schema" => "rfc2307", "cache_credentials" => "true", "enumerate" => "true", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-3.1.1/testsuite/tests/Export3.out new/yast2-ldap-client-3.1.3/testsuite/tests/Export3.out --- old/yast2-ldap-client-3.1.1/testsuite/tests/Export3.out 2013-10-23 14:35:30.000000000 +0200 +++ new/yast2-ldap-client-3.1.3/testsuite/tests/Export3.out 2013-11-22 13:55:03.000000000 +0100 @@ -19,7 +19,7 @@ Read .etc.krb5_conf.v.libdefaults.default_realm ["SUSE.CZ"] Read .etc.krb5_conf.v."SUSE.CZ"."kdc" ["kdc.suse.cz", "kdc.suse.de"] Read .etc.sssd_conf.v."domain/default"."krb5_realm" "SUSE.CZ" -Read .etc.sssd_conf.v."domain/default"."krb5_kdcip" nil +Read .etc.sssd_conf.v."domain/default"."krb5_server" nil 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" @@ -28,4 +28,4 @@ Read .etc.sssd_conf.v."domain/default"."ldap_group_search_base" "ou=group,dc=suse,dc=cz" Read .etc.sssd_conf.v."domain/default"."ldap_autofs_search_base" nil 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, "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", "sssd_with_krb":true, "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_realm":"SUSE.CZ", "krb5_server":"kdc.suse.cz,kdc.suse.de", "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", "sssd_with_krb":true, "start_autofs":true, "start_ldap":true, "tls_cacertdir":"/etc/openldap/cacerts/"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-3.1.1/testsuite/tests/Export3.rb new/yast2-ldap-client-3.1.3/testsuite/tests/Export3.rb --- old/yast2-ldap-client-3.1.1/testsuite/tests/Export3.rb 2013-10-23 14:35:30.000000000 +0200 +++ new/yast2-ldap-client-3.1.3/testsuite/tests/Export3.rb 2013-11-22 13:55:03.000000000 +0100 @@ -53,7 +53,7 @@ "domain/default" => { "krb5_realm" => "SUSE.CZ", # this ensures kdc is read from krb5.conf - "krb5_kdcip" => nil, + "krb5_server" => nil, "ldap_schema" => "rfc2307", "cache_credentials" => "true", "enumerate" => "true", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-3.1.1/testsuite/tests/Read2.out new/yast2-ldap-client-3.1.3/testsuite/tests/Read2.out --- old/yast2-ldap-client-3.1.1/testsuite/tests/Read2.out 2013-10-23 14:35:30.000000000 +0200 +++ new/yast2-ldap-client-3.1.3/testsuite/tests/Read2.out 2013-11-22 13:55:03.000000000 +0100 @@ -16,7 +16,7 @@ Execute .passwd.init $["base_directory":"/etc"] true Read .passwd.passwd.pluslines ["+"] Read .etc.sssd_conf.v."domain/default"."krb5_realm" "SUSE.CZ" -Read .etc.sssd_conf.v."domain/default"."krb5_kdcip" "kdc.suse.cz" +Read .etc.sssd_conf.v."domain/default"."krb5_server" "kdc.suse.cz" Read .etc.sssd_conf.v."domain/default"."ldap_schema" nil Read .etc.sssd_conf.v."domain/default"."cache_credentials" "True" Read .etc.sssd_conf.v."domain/default"."enumerate" nil @@ -30,3 +30,31 @@ Dump nss: -dc=suse,dc=cz- Dump nss: -ou=group,dc=suse,dc=cz- Dump nss: -dc=suse,dc=cz- +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"."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 +Read .etc.ldap_conf.v."/etc/ldap.conf"."tls_checkpeer" "no" +Read .etc.ldap_conf.v."/etc/ldap.conf"."nss_base_passwd" nil +Read .etc.ldap_conf.v."/etc/ldap.conf"."nss_base_shadow" nil +Read .etc.ldap_conf.v."/etc/ldap.conf"."nss_base_group" nil +Read .etc.ldap_conf.v."/etc/ldap.conf"."nss_base_automount" nil +Read .etc.ldap_conf.v."/etc/ldap.conf"."pam_password" "crypt" +Read .sysconfig.ldap.BASE_CONFIG_DN nil +Read .sysconfig.ldap.FILE_SERVER "no" +Read .sysconfig.ldap.BIND_DN "uid=manager,dc=suse,dc=cz" +Read .etc.ldap_conf.v."/etc/ldap.conf"."nss_map_attribute" 0 +Execute .passwd.init $["base_directory":"/etc"] true +Read .passwd.passwd.pluslines ["+"] +Read .etc.sssd_conf.v."domain/default"."krb5_realm" "SUSE.CZ" +Read .etc.sssd_conf.v."domain/default"."krb5_server" "kdc.suse.cz" +Read .etc.sssd_conf.v."domain/default"."ldap_schema" nil +Read .etc.sssd_conf.v."domain/default"."cache_credentials" "True" +Read .etc.sssd_conf.v."domain/default"."enumerate" nil +Read .etc.sssd_conf.v."domain/default"."ldap_id_use_start_tls" nil +Read .etc.sssd_conf.v."domain/default"."ldap_user_search_base" nil +Read .etc.sssd_conf.v."domain/default"."ldap_group_search_base" "ou=group,dc=suse,dc=cz" +Read .etc.sssd_conf.v."domain/default"."ldap_autofs_search_base" nil +Return true +Dump sssd: -true- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-3.1.1/testsuite/tests/Read2.rb new/yast2-ldap-client-3.1.3/testsuite/tests/Read2.rb --- old/yast2-ldap-client-3.1.1/testsuite/tests/Read2.rb 2013-10-23 14:35:30.000000000 +0200 +++ new/yast2-ldap-client-3.1.3/testsuite/tests/Read2.rb 2013-11-22 13:55:03.000000000 +0100 @@ -54,7 +54,7 @@ "v" => { "domain/default" => { "krb5_realm" => "SUSE.CZ", - "krb5_kdcip" => "kdc.suse.cz", + "krb5_server" => "kdc.suse.cz", "ldap_schema" => nil, "cache_credentials" => "True", "enumerate" => nil, @@ -98,6 +98,11 @@ Testsuite.Dump(Builtins.sformat("nss: -%1-", Ldap.nss_base_group)) Testsuite.Dump(Builtins.sformat("nss: -%1-", Ldap.nss_base_automount)) + # test that sssd is true on read even if not present in nsswitch + @READ["etc"]["nsswitch_conf"]["passwd"] = "" + Testsuite.Test(lambda { Ldap.Read }, [@READ, {}, @EX], 0) + Testsuite.Dump(Builtins.sformat("sssd: -%1-", Ldap.sssd)) + nil end end -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
