diff --git a/Fix-build-failure-against-samba-4.12.0rc1.patch b/Fix-build-failure-against-samba-4.12.0rc1.patch new file mode 100644 index 0000000000000000000000000000000000000000..ff0c6f6f141cd5c1ea7037a0cac1417c2fedce6d --- /dev/null +++ b/Fix-build-failure-against-samba-4.12.0rc1.patch @@ -0,0 +1,53 @@ +From bc56b10aea999284458dcc293b54cf65288e325d Mon Sep 17 00:00:00 2001 +From: Stephen Gallagher +Date: Fri, 24 Jan 2020 15:17:39 +0100 +Subject: [PATCH 200/459] Fix build failure against samba 4.12.0rc1 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The ndr_pull_get_switch() function was dropped, but it was just a wrapper +around the ndr_token_peek() function, so we can use this approach on both +old and new versions of libndr. + +Signed-off-by: Stephen Gallagher + +Reviewed-by: Pavel Březina +--- + src/providers/ad/ad_gpo_ndr.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/providers/ad/ad_gpo_ndr.c b/src/providers/ad/ad_gpo_ndr.c +index d573033..8f405aa 100644 +--- a/src/providers/ad/ad_gpo_ndr.c ++++ b/src/providers/ad/ad_gpo_ndr.c +@@ -105,7 +105,7 @@ ndr_pull_security_ace_object_type(struct ndr_pull *ndr, + union security_ace_object_type *r) + { + uint32_t level; +- level = ndr_pull_get_switch_value(ndr, r); ++ level = ndr_token_peek(&ndr->switch_list, r); + NDR_PULL_CHECK_FLAGS(ndr, ndr_flags); + if (ndr_flags & NDR_SCALARS) { + NDR_CHECK(ndr_pull_union_align(ndr, 4)); +@@ -135,7 +135,7 @@ ndr_pull_security_ace_object_inherited_type(struct ndr_pull *ndr, + union security_ace_object_inherited_type *r) + { + uint32_t level; +- level = ndr_pull_get_switch_value(ndr, r); ++ level = ndr_token_peek(&ndr->switch_list, r); + NDR_PULL_CHECK_FLAGS(ndr, ndr_flags); + if (ndr_flags & NDR_SCALARS) { + NDR_CHECK(ndr_pull_union_align(ndr, 4)); +@@ -198,7 +198,7 @@ ndr_pull_security_ace_object_ctr(struct ndr_pull *ndr, + union security_ace_object_ctr *r) + { + uint32_t level; +- level = ndr_pull_get_switch_value(ndr, r); ++ level = ndr_token_peek(&ndr->switch_list, r); + NDR_PULL_CHECK_FLAGS(ndr, ndr_flags); + if (ndr_flags & NDR_SCALARS) { + NDR_CHECK(ndr_pull_union_align(ndr, 4)); +-- +1.8.3.1 + diff --git a/sssd.spec b/sssd.spec index ed35cecdf5c8afceda7cd2ab0fc4439e690ce790..fc85c05ffb7390f64f2c11dbb0f4e18e0a16a598 100644 --- a/sssd.spec +++ b/sssd.spec @@ -1,12 +1,13 @@ Name: sssd Version: 2.2.3 -Release: 1 +Release: 2 Summary: System Security Services Daemon License: GPLv3+ and LGPLv3+ URL: https://pagure.io/SSSD/sssd/ Source0: https://releases.pagure.org/SSSD/sssd/%{name}-%{version}.tar.gz Patch0:sssd-BUILD-Accept-krb5-1.18-for-building-the-PAC-plu.patch +Patch1:Fix-build-failure-against-samba-4.12.0rc1.patch Requires: python3-sssd = %{version}-%{release} Requires: libldb @@ -575,6 +576,9 @@ fi %{_libdir}/%{name}/modules/libwbclient.so %changelog +* Fri Aug 7 2020 yang_zhuang_zhuang - 2.2.3-2 +- Fix build failure + * Sat Jul 25 2020 yang_zhuang_zhuang - 2.2.3-1 - update version to 2.2.3