Merge ~sergiodj/ubuntu/+source/sssd:merge-2.7.1-2-kinetic into ubuntu/+source/sssd:ubuntu/devel

Proposed by Sergio Durigan Junior
Status: Superseded
Proposed branch: ~sergiodj/ubuntu/+source/sssd:merge-2.7.1-2-kinetic
Merge into: ubuntu/+source/sssd:ubuntu/devel
Diff against target: 221258 lines (+47011/-32253) (has conflicts)
356 files modified
BUILD.txt (+1/-1)
Makefile.am (+100/-17)
Makefile.in (+914/-323)
config.h.in (+12/-0)
configure (+445/-10)
configure.ac (+7/-0)
contrib/ci/README.md (+2/-12)
contrib/ci/configure.sh (+3/-1)
contrib/ci/deps.sh (+23/-7)
contrib/ci/distro.sh (+6/-2)
contrib/ci/rpm-spec-builddeps (+1/-1)
contrib/ci/run (+22/-24)
contrib/ci/sssd.supp (+20/-0)
contrib/fedora/bashrc_sssd (+2/-0)
contrib/fedora/make_srpm.sh (+9/-0)
contrib/sssd.spec.in (+25/-1)
debian/changelog (+58/-0)
debian/control (+12/-0)
debian/patches/pac-relax-default-for-pac_check-option.diff (+40/-0)
debian/patches/series (+1/-0)
debian/rules (+11/-1)
debian/sssd-common.install (+7/-2)
debian/sssd-idp.install (+4/-0)
debian/sssd-kcm.install (+1/-0)
debian/sssd-krb5.install (+2/-0)
debian/tests/ldap-user-group-krb5-auth (+1/-1)
debian/tests/util (+8/-2)
debian/upstream/signing-key.asc (+52/-0)
dev/null (+0/-40)
po/bg.po (+471/-433)
po/ca.po (+471/-433)
po/cs.po (+473/-436)
po/de.po (+469/-431)
po/es.po (+469/-431)
po/eu.po (+471/-433)
po/fi.po (+482/-440)
po/fr.po (+469/-431)
po/hu.po (+471/-433)
po/id.po (+470/-432)
po/it.po (+469/-431)
po/ja.po (+469/-431)
po/ko.po (+475/-437)
po/nb.po (+471/-433)
po/nl.po (+471/-433)
po/pl.po (+470/-430)
po/pt.po (+470/-432)
po/pt_BR.po (+471/-432)
po/ru.po (+487/-447)
po/sssd.pot (+465/-427)
po/sv.po (+468/-430)
po/tg.po (+470/-432)
po/tr.po (+469/-431)
po/uk.po (+469/-430)
po/zh_CN.po (+469/-431)
po/zh_TW.po (+470/-432)
src/conf_macros.m4 (+18/-0)
src/confdb/confdb.c (+335/-181)
src/confdb/confdb.h (+5/-0)
src/config/SSSDConfig/__init__.py (+1/-1)
src/config/SSSDConfig/__init__.py.in (+1/-1)
src/config/SSSDConfig/ipachangeconf.py (+60/-74)
src/config/SSSDConfig/sssdoptions.py (+19/-12)
src/config/SSSDConfigTest.py (+78/-72)
src/config/cfg_rules.ini (+4/-0)
src/config/etc/sssd.api.conf (+2/-0)
src/config/etc/sssd.api.d/sssd-ad.conf (+1/-0)
src/config/etc/sssd.api.d/sssd-ipa.conf (+1/-0)
src/config/etc/sssd.api.d/sssd-krb5.conf (+1/-0)
src/config/etc/sssd.api.d/sssd-ldap.conf (+1/-0)
src/config/setup.py (+1/-1)
src/db/sysdb.c (+0/-190)
src/db/sysdb.h (+0/-16)
src/db/sysdb_services.c (+1/-1)
src/db/sysdb_upgrade.c (+5/-0)
src/external/libcurl.m4 (+4/-0)
src/external/libjansson.m4 (+16/-0)
src/external/libjose.m4 (+4/-0)
src/external/libkrad.m4 (+4/-0)
src/external/samba.m4 (+5/-0)
src/krb5_plugin/idp/idp.h (+73/-0)
src/krb5_plugin/idp/idp_clpreauth.c (+243/-0)
src/krb5_plugin/idp/idp_kdcpreauth.c (+853/-0)
src/krb5_plugin/idp/idp_utils.c (+388/-0)
src/krb5_plugin/idp/sssd_enable_idp (+14/-0)
src/krb5_plugin/sssd_krb5_localauth_plugin.c (+4/-3)
src/ldb_modules/memberof.c (+3/-0)
src/lib/idmap/sss_idmap.c (+1/-1)
src/lib/sifp/sss_sifp_attrs.c (+1/-1)
src/lib/sifp/sss_sifp_parser.c (+2/-2)
src/man/Makefile.am (+1/-1)
src/man/Makefile.in (+18/-6)
src/man/br/include/debug_levels.xml (+6/-0)
src/man/ca/include/debug_levels.xml (+6/-0)
src/man/cs/include/debug_levels.xml (+6/-0)
src/man/de/include/debug_levels.xml (+6/-0)
src/man/de/sssd-krb5.5.xml (+15/-1)
src/man/es/include/debug_levels.xml (+6/-0)
src/man/es/sssd-ldap.5.xml (+19/-0)
src/man/es/sssd.conf.5.xml (+100/-19)
src/man/eu/include/debug_levels.xml (+6/-0)
src/man/fi/include/debug_levels.xml (+6/-0)
src/man/fi/include/service_discovery.xml (+1/-1)
src/man/fr/include/debug_levels.xml (+6/-0)
src/man/include/debug_levels.xml (+7/-0)
src/man/ja/include/debug_levels.xml (+6/-0)
src/man/lv/include/debug_levels.xml (+6/-0)
src/man/nl/include/debug_levels.xml (+6/-0)
src/man/po/br.po (+1179/-964)
src/man/po/ca.po (+1189/-964)
src/man/po/cs.po (+1181/-964)
src/man/po/de.po (+1199/-964)
src/man/po/es.po (+1219/-969)
src/man/po/eu.po (+1177/-964)
src/man/po/fi.po (+1187/-968)
src/man/po/fr.po (+1199/-964)
src/man/po/ja.po (+1191/-964)
src/man/po/lv.po (+1181/-964)
src/man/po/nl.po (+1181/-964)
src/man/po/po4a.cfg (+1/-0)
src/man/po/pt.po (+1189/-964)
src/man/po/pt_BR.po (+1177/-964)
src/man/po/ru.po (+1227/-970)
src/man/po/sssd-docs.pot (+1179/-965)
src/man/po/sv.po (+1251/-981)
src/man/po/tg.po (+1177/-964)
src/man/po/uk.po (+1252/-983)
src/man/po/zh_CN.po (+1177/-964)
src/man/pt/include/debug_levels.xml (+6/-0)
src/man/pt_BR/include/debug_levels.xml (+6/-0)
src/man/ru/include/debug_levels.xml (+6/-0)
src/man/ru/sssd-ifp.5.xml (+0/-4)
src/man/ru/sssd-krb5.5.xml (+15/-1)
src/man/ru/sssd-ldap.5.xml (+19/-0)
src/man/ru/sssd.conf.5.xml (+101/-20)
src/man/sssd-ifp.5.xml (+0/-5)
src/man/sssd-krb5.5.xml (+17/-1)
src/man/sssd-ldap.5.xml (+23/-0)
src/man/sssd.conf.5.xml (+115/-21)
src/man/sssd_krb5_localauth_plugin.8.xml (+70/-0)
src/man/sv/include/debug_levels.xml (+6/-0)
src/man/sv/include/ldap_id_mapping.xml (+7/-7)
src/man/sv/sssd-ifp.5.xml (+0/-4)
src/man/sv/sssd-krb5.5.xml (+15/-1)
src/man/sv/sssd-ldap.5.xml (+19/-0)
src/man/sv/sssd.conf.5.xml (+100/-19)
src/man/tg/include/debug_levels.xml (+6/-0)
src/man/uk/include/debug_levels.xml (+6/-0)
src/man/uk/include/ldap_id_mapping.xml (+9/-7)
src/man/uk/sssd-ifp.5.xml (+0/-4)
src/man/uk/sssd-krb5.5.xml (+15/-2)
src/man/uk/sssd-ldap.5.xml (+19/-0)
src/man/uk/sssd.conf.5.xml (+101/-20)
src/man/zh_CN/include/debug_levels.xml (+6/-0)
src/monitor/monitor.c (+22/-2)
src/oidc_child/oidc_child.c (+561/-0)
src/oidc_child/oidc_child_curl.c (+473/-0)
src/oidc_child/oidc_child_json.c (+505/-0)
src/oidc_child/oidc_child_util.h (+97/-0)
src/p11_child/p11_child.h (+2/-1)
src/p11_child/p11_child_common_utils.c (+36/-8)
src/p11_child/p11_child_openssl.c (+17/-9)
src/providers/ad/ad_common.c (+8/-0)
src/providers/ad/ad_domain_info.c (+24/-1)
src/providers/ad/ad_gpo.c (+1/-1)
src/providers/ad/ad_gpo_child.c (+145/-8)
src/providers/ad/ad_gpo_ndr.c (+2/-3)
src/providers/ad/ad_opts.c (+3/-1)
src/providers/ad/ad_pac.c (+5/-3)
src/providers/ad/ad_pac.h (+7/-2)
src/providers/ad/ad_pac_common.c (+359/-6)
src/providers/data_provider/dp.c (+1/-4)
src/providers/data_provider/dp.h (+2/-0)
src/providers/data_provider/dp_client.c (+11/-0)
src/providers/data_provider/dp_request.c (+6/-0)
src/providers/files/files_ops.c (+2/-2)
src/providers/ipa/ipa_common.c (+9/-0)
src/providers/ipa/ipa_opts.c (+2/-0)
src/providers/ipa/ipa_s2n_exop.c (+71/-27)
src/providers/ipa/ipa_subdomains.c (+6/-19)
src/providers/ipa/ipa_sudo_conversion.c (+1/-1)
src/providers/ipa/ipa_sudo_refresh.c (+2/-10)
src/providers/krb5/krb5_auth.c (+2/-1)
src/providers/krb5/krb5_auth.h (+2/-0)
src/providers/krb5/krb5_child.c (+527/-75)
src/providers/krb5/krb5_child_handler.c (+247/-75)
src/providers/krb5/krb5_common.c (+2/-0)
src/providers/krb5/krb5_common.h (+4/-0)
src/providers/krb5/krb5_init_shared.c (+6/-0)
src/providers/krb5/krb5_opts.c (+1/-0)
src/providers/krb5/krb5_utils.c (+1/-1)
src/providers/ldap/ldap_auth.c (+2/-2)
src/providers/ldap/ldap_common.h (+3/-0)
src/providers/ldap/ldap_id.c (+1/-1)
src/providers/ldap/ldap_opts.c (+1/-0)
src/providers/ldap/sdap.c (+212/-19)
src/providers/ldap/sdap.h (+20/-19)
src/providers/ldap/sdap_async.c (+152/-18)
src/providers/ldap/sdap_async_connection.c (+21/-10)
src/providers/ldap/sdap_async_groups.c (+2/-2)
src/providers/ldap/sdap_async_initgroups.c (+24/-29)
src/providers/ldap/sdap_async_initgroups_ad.c (+10/-24)
src/providers/ldap/sdap_async_iphost.c (+2/-3)
src/providers/ldap/sdap_async_ipnetwork.c (+2/-3)
src/providers/ldap/sdap_async_nested_groups.c (+73/-36)
src/providers/ldap/sdap_async_netgroups.c (+1/-1)
src/providers/ldap/sdap_async_private.h (+10/-1)
src/providers/ldap/sdap_async_resolver_enum.h (+3/-3)
src/providers/ldap/sdap_async_services.c (+3/-5)
src/providers/ldap/sdap_domain.c (+21/-0)
src/providers/ldap/sdap_online_check.c (+3/-12)
src/providers/ldap/sdap_sudo_refresh.c (+2/-10)
src/providers/proxy/proxy.h (+0/-2)
src/providers/proxy/proxy_auth.c (+44/-22)
src/providers/proxy/proxy_client.c (+10/-0)
src/providers/simple/simple_access_check.c (+1/-1)
src/responder/common/cache_req/cache_req.c (+14/-11)
src/responder/common/cache_req/cache_req.h (+0/-22)
src/responder/common/cache_req/cache_req_search.c (+1/-5)
src/responder/common/cache_req/plugins/cache_req_common.c (+1/-1)
src/responder/common/cache_req/plugins/cache_req_enum_groups.c (+0/-21)
src/responder/common/cache_req/plugins/cache_req_enum_users.c (+0/-21)
src/responder/common/responder_common.c (+1/-1)
src/responder/common/responder_dp.c (+1/-4)
src/responder/common/responder_get_domains.c (+1/-4)
src/responder/ifp/ifp_iface/ifp_iface_types.c (+10/-1)
src/responder/ifp/ifp_iface/ifp_iface_types.h (+3/-3)
src/responder/ifp/ifp_iface_nodes.c (+1/-1)
src/responder/nss/nss_cmd.c (+33/-9)
src/responder/nss/nss_get_object.c (+16/-0)
src/responder/nss/nss_private.h (+1/-0)
src/responder/nss/nss_protocol_sid.c (+66/-21)
src/responder/nss/nss_protocol_svcent.c (+1/-1)
src/responder/nss/nsssrv.c (+27/-1)
src/responder/nss/nsssrv_mmap_cache.c (+82/-21)
src/responder/nss/nsssrv_mmap_cache.h (+21/-14)
src/responder/pac/pacsrv.c (+6/-0)
src/responder/pac/pacsrv.h (+1/-0)
src/responder/pac/pacsrv_cmd.c (+18/-2)
src/responder/pam/pam_prompting_config.c (+1/-1)
src/responder/pam/pamsrv_cmd.c (+21/-2)
src/responder/sudo/sudosrv_get_sudorules.c (+4/-13)
src/sbus/codegen/sbus_CodeGen.py (+1/-1)
src/sbus/codegen/sbus_Invoker.py (+0/-1)
src/sbus/connection/sbus_connection_connect.c (+1/-4)
src/sbus/interface/sbus_iterator_readers.c (+3/-3)
src/sbus/router/sbus_router.c (+4/-0)
src/sss_client/autofs/autofs_test_client.c (+1/-1)
src/sss_client/idmap/sss_nss_ex.c (+3/-2)
src/sss_client/idmap/sss_nss_idmap.c (+83/-4)
src/sss_client/idmap/sss_nss_idmap.exports (+9/-0)
src/sss_client/idmap/sss_nss_idmap.h (+95/-2)
src/sss_client/nss_mc.h (+6/-0)
src/sss_client/nss_mc_sid.c (+194/-0)
src/sss_client/pam_message.c (+11/-0)
src/sss_client/pam_message.h (+4/-0)
src/sss_client/pam_sss.c (+120/-20)
src/sss_client/pam_sss_gss.c (+2/-1)
src/sss_client/sss_cli.h (+31/-1)
src/sss_client/sudo_testcli/sudo_testcli.c (+2/-2)
src/sss_iface/sss_iface_types.c (+10/-0)
src/sss_iface/sss_iface_types.h (+1/-1)
src/systemtap/sssd.stp.in (+2/-2)
src/sysv/systemd/sssd.service.in (+3/-1)
src/tests/check_file-tests.c (+30/-78)
src/tests/cmocka/common_mock.h (+6/-0)
src/tests/cmocka/common_utils.c (+66/-0)
src/tests/cmocka/test_ad_common.c (+232/-7)
src/tests/cmocka/test_authtok.c (+44/-0)
src/tests/cmocka/test_kcm_renewals.c (+0/-84)
src/tests/cmocka/test_krb5_idp_plugin.c (+230/-0)
src/tests/cmocka/test_nss_srv.c (+187/-0)
src/tests/cmocka/test_pam_srv.c (+425/-10)
src/tests/cmocka/test_sdap.c (+104/-0)
src/tests/cmocka/test_search_bases.c (+47/-1)
src/tests/cmocka/test_sssd_krb5_localauth_plugin.c (+31/-1)
src/tests/cmocka/test_utils.c (+105/-31)
src/tests/cwrap/Makefile.am (+4/-5)
src/tests/cwrap/Makefile.in (+38/-86)
src/tests/cwrap/test_responder_common.c (+0/-7)
src/tests/cwrap/test_usertools.c (+0/-6)
src/tests/debug-tests.c (+1/-1)
src/tests/dlopen-tests.c (+1/-0)
src/tests/files-tests.c (+2/-6)
src/tests/intg/Makefile.in (+11/-0)
src/tests/intg/ds_openldap.py (+8/-8)
src/tests/intg/ent.py (+0/-1)
src/tests/intg/ent_test.py (+1/-3)
src/tests/intg/kdc.py (+1/-1)
src/tests/intg/ldap_local_override_test.py (+6/-7)
src/tests/intg/sssd_id.py (+1/-2)
src/tests/intg/sssd_ldb.py (+0/-1)
src/tests/intg/sssd_netgroup.py (+1/-2)
src/tests/intg/sssd_nss.py (+1/-1)
src/tests/intg/test_enumeration.py (+4/-4)
src/tests/intg/test_files_provider.py (+4/-6)
src/tests/intg/test_infopipe.py (+8/-31)
src/tests/intg/test_kcm.py (+18/-16)
src/tests/intg/test_ldap.py (+35/-32)
src/tests/intg/test_memory_cache.py (+5/-5)
src/tests/intg/test_netgroup.py (+3/-3)
src/tests/intg/test_pac_responder.py (+3/-3)
src/tests/intg/test_pam_responder.py (+19/-20)
src/tests/intg/test_pysss_nss_idmap.py (+62/-7)
src/tests/intg/test_resolver.py (+3/-4)
src/tests/intg/test_session_recording.py (+5/-5)
src/tests/intg/test_ssh_pubkey.py (+3/-3)
src/tests/intg/test_sssctl.py (+3/-5)
src/tests/intg/test_sudo.py (+3/-3)
src/tests/intg/test_ts_cache.py (+23/-23)
src/tests/ipa_ldap_opt-tests.c (+8/-8)
src/tests/multihost/basic/test_config.py (+5/-6)
src/tests/multihost/basic/test_files.py (+1/-4)
src/tests/multihost/basic/test_ifp.py (+0/-2)
src/tests/multihost/basic/test_kcm.py (+2/-2)
src/tests/multihost/basic/test_sssctl_config_check.py (+0/-1)
src/tests/multihost/basic/test_sudo.py (+0/-10)
src/tests/pyhbac-test.py (+0/-1)
src/tests/python-test.py (+2/-2)
src/tests/test_CA/Makefile.am (+6/-1)
src/tests/test_CA/Makefile.in (+17/-2)
src/tests/test_CA/intermediate_CA/Makefile.in (+11/-0)
src/tests/test_ECC_CA/Makefile.am (+6/-3)
src/tests/test_ECC_CA/Makefile.in (+17/-3)
src/tools/analyzer/Makefile.in (+11/-0)
src/tools/analyzer/modules/request.py (+6/-6)
src/tools/analyzer/sss_analyze.py (+1/-1)
src/tools/sss_cache.c (+1/-1)
src/tools/sss_override.c (+3/-3)
src/tools/sssctl/sssctl_cache.c (+1/-1)
src/util/atomic_io.c (+38/-0)
src/util/atomic_io.h (+13/-0)
src/util/authtok.c (+46/-0)
src/util/authtok.h (+36/-0)
src/util/cert/libcrypto/cert.c (+1/-1)
src/util/check_file.c (+1/-56)
src/util/child_common.c (+131/-44)
src/util/child_common.h (+28/-4)
src/util/debug.c (+1/-1)
src/util/debug.h (+2/-1)
src/util/mmap_cache.h (+9/-0)
src/util/nss_dl_load.c (+1/-12)
src/util/nss_dl_load.h (+0/-3)
src/util/pac_utils.c (+146/-0)
src/util/sss_cli_cmd.c (+4/-3)
src/util/sss_krb5.c (+6/-12)
src/util/sss_krb5.h (+6/-5)
src/util/sss_pam_data.c (+1/-0)
src/util/sss_pam_data.h (+1/-0)
src/util/sss_time.c (+76/-0)
src/util/usertools.c (+13/-35)
src/util/util.h (+26/-20)
src/util/util_errors.c (+2/-0)
src/util/util_errors.h (+2/-0)
src/util/util_lock.c (+6/-2)
src/util/well_known_sids.c (+6/-3)
version.m4 (+1/-1)
Conflict in debian/changelog
Reviewer Review Type Date Requested Status
git-ubuntu bot Pending
Canonical Server packageset reviewers Pending
Canonical Server Pending
Review via email: mp+424697@code.staging.launchpad.net

Description of the change

This is the merge of sssd 2.7.1-2 from Debian unstable.

The merge itself was simple, and we're actually able to even drop one of our deltas (the LTO one). The rest of our delta is very Ubuntu-specific and I don't see us getting rid of it anytime soon, but it's also very easy to maintain.

This new upstream release fixes a bunch of bugs, including one that I reported to upstream a while ago and is causing authentication failures (see bug #1934997). I looked at the current list of bugs for the package and couldn't find anything else that may be fixed by this new release.

There was a problem with version 2.7.1-1 (see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1012502) but that's been fixed by 2.7.1-2 which backports an upstream patch (https://github.com/SSSD/sssd/pull/6204). This should be part of the next minor release.

There's a PPA with the proposed changes here:

https://launchpad.net/~sergiodj/+archive/ubuntu/sssd-merge/+packages

The builds are still running. Once they finish, I'll trigger autopkgtests and post the results here.

To post a comment you must log in.

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches