[Pkg-sssd-devel] sssd: Changes to 'master'

[Timo Aaltonen]

 debian/changelog                                     |    7 +++
 debian/patches/ipa-terminate-if-view-name-fails.diff |   37 +++++++++++++++++++
 debian/patches/series                                |    2 -
 3 files changed, 45 insertions(+), 1 deletion(-)

New commits:
commit 4214ee1fca2a958e66af6b912e540231cc756f4c
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Wed Apr 20 16:55:33 2016 +0300

    releasing package sssd version 1.13.4-2

diff --git a/debian/changelog b/debian/changelog
index b75f0a2..ca9aae2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-sssd (1.13.4-2) UNRELEASED; urgency=medium
+sssd (1.13.4-2) unstable; urgency=medium
 
   * ipa-terminate-if-view-name-fails.diff: Fix support for older IPA
     servers. (LP: #1572582)
 
- -- Timo Aaltonen <tjaalton at debian.org>  Wed, 20 Apr 2016 14:38:41 +0300
+ -- Timo Aaltonen <tjaalton at debian.org>  Wed, 20 Apr 2016 16:55:24 +0300
 
 sssd (1.13.4-1) unstable; urgency=medium
 

commit 6a37b2d79e945a36f07314bf471696bfa4025b5c
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Wed Apr 20 16:48:57 2016 +0300

    ipa-terminate-if-view-name-fails.diff: Fix support for older IPA servers.

diff --git a/debian/changelog b/debian/changelog
index 4e9959e..b75f0a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sssd (1.13.4-2) UNRELEASED; urgency=medium
+
+  * ipa-terminate-if-view-name-fails.diff: Fix support for older IPA
+    servers. (LP: #1572582)
+
+ -- Timo Aaltonen <tjaalton at debian.org>  Wed, 20 Apr 2016 14:38:41 +0300
+
 sssd (1.13.4-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/ipa-terminate-if-view-name-fails.diff b/debian/patches/ipa-terminate-if-view-name-fails.diff
new file mode 100644
index 0000000..b5df1e1
--- /dev/null
+++ b/debian/patches/ipa-terminate-if-view-name-fails.diff
@@ -0,0 +1,37 @@
+From 1e052649e15f5830ffbc6ba0dc4a78c49a3a95ba Mon Sep 17 00:00:00 2001
+From: Sumit Bose <sbose at redhat.com>
+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
+---
+ 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 bcc6347fa0c53939bb60cff2e903e1db6e2bb6b6..bfe770be6f8c94478baecd1bb88cedc222586187 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.1.0
+
diff --git a/debian/patches/series b/debian/patches/series
index a82d1b4..f3a8059 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-#placeholder
+ipa-terminate-if-view-name-fails.diff