diff --git a/0001-IPA-terminate-properly-if-view-name-lookup-fails.patch b/0001-IPA-terminate-properly-if-view-name-lookup-fails.patch new file mode 100644 index 0000000..c1720dc --- /dev/null +++ b/0001-IPA-terminate-properly-if-view-name-lookup-fails.patch @@ -0,0 +1,40 @@ +From d3fd5365fb9fad89af47e17da35cef1a34aff1d3 Mon Sep 17 00:00:00 2001 +From: Sumit Bose +Date: Tue, 19 Apr 2016 15:07:18 +0200 +Subject: [PATCH] IPA: terminate properly if view name lookup fails + +Since commit 5a5f1e1053415efaa99bb4d5bc7ce7ac0a95b757 the view name +lookup is the last step in the subdomain lookup request. In case of an +error the request should be finished and no previous step should be +called again. + +Resolves https://fedorahosted.org/sssd/ticket/2993 + +Reviewed-by: Jakub Hrozek +(cherry picked from commit 57d8b4b9254442a568838cb60ea16068965f2df0) +--- + src/providers/ipa/ipa_subdomains.c | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +diff --git a/src/providers/ipa/ipa_subdomains.c b/src/providers/ipa/ipa_subdomains.c +index cb5a23bfb8043e620061e11d5e567d3e39eab6e3..62796b8d15682aedb952b9c46561867d82684b80 100644 +--- a/src/providers/ipa/ipa_subdomains.c ++++ b/src/providers/ipa/ipa_subdomains.c +@@ -840,13 +840,7 @@ static void ipa_get_view_name_done(struct tevent_req *req) + if (ret == EOPNOTSUPP || ret == EIO) { + DEBUG(SSSDBG_TRACE_FUNC, "get_view_name request failed, looks " \ + "like server does not support views.\n"); +- ret = ipa_check_master(ctx); +- if (ret == EAGAIN) { +- return; +- } else if (ret != EOK) { +- goto done; +- } +- ++ ret = EOK; + } else { + DEBUG(SSSDBG_OP_FAILURE, "get_view_name request failed.\n"); + } +-- +2.7.3 + diff --git a/0001-Netlink-Ignore-RTM_NEWADDR-signals-from-link-local.patch b/1001-Netlink-Ignore-RTM_NEWADDR-signals-from-link-local.patch similarity index 100% rename from 0001-Netlink-Ignore-RTM_NEWADDR-signals-from-link-local.patch rename to 1001-Netlink-Ignore-RTM_NEWADDR-signals-from-link-local.patch diff --git a/sssd.spec b/sssd.spec index 0b0313b..9c02447 100644 --- a/sssd.spec +++ b/sssd.spec @@ -24,7 +24,7 @@ Name: sssd Version: 1.13.4 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/System Summary: System Security Services Daemon License: GPLv3+ @@ -33,7 +33,8 @@ Source0: https://fedorahosted.org/released/sssd/%{name}-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) ### Patches ### -Patch0001: 0001-Netlink-Ignore-RTM_NEWADDR-signals-from-link-local.patch +Patch0001: 0001-IPA-terminate-properly-if-view-name-lookup-fails.patch +Patch1001: 1001-Netlink-Ignore-RTM_NEWADDR-signals-from-link-local.patch ### Dependencies ### @@ -1019,6 +1020,9 @@ fi %{_libdir}/%{name}/modules/libwbclient.so %changelog +* Fri Apr 22 2016 Lukas Slebodnik - 1.13.4-2 +- Resolves: rhbz#1328108 - Protocol error with FreeIPA on CentOS 6 + * Thu Apr 14 2016 Lukas Slebodnik - 1.13.4-1 - New upstream release 1.13.4 - https://fedorahosted.org/sssd/wiki/Releases/Notes-1.13.4