From a2ee98d91aa34a81e7b829a1ba132edd35589609 Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek@redhat.com>
Date: Tue, 30 Oct 2012 19:37:27 +0100
Subject: [PATCH] rhbz#867874:  sssd does not resolve group names from AD

---
 ...-Fix-two-errors-in-the-nss-responder.patch | 40 +++++++++++++++++++
 sssd.spec                                     |  6 ++-
 2 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 0002-Fix-two-errors-in-the-nss-responder.patch

diff --git a/0002-Fix-two-errors-in-the-nss-responder.patch b/0002-Fix-two-errors-in-the-nss-responder.patch
new file mode 100644
index 0000000..f15dd8f
--- /dev/null
+++ b/0002-Fix-two-errors-in-the-nss-responder.patch
@@ -0,0 +1,40 @@
+From 10e08f08a64fff15a914598f4561cdb14203dc37 Mon Sep 17 00:00:00 2001
+From: Sumit Bose <sbose@redhat.com>
+Date: Fri, 19 Oct 2012 18:10:43 +0200
+Subject: [PATCH] Fix two errors in the nss responder
+
+One is a copy-and-paste error which was introduce by
+1774ee9a61b9d691dadd1a0538f32bcdcc84f72f.
+
+The second fixes a missing explicit setting of the return value. In the
+case where we want fully qualified names ret contains the number of
+characters from the last snprintf() which is almost ever not 0.
+---
+ src/responder/nss/nsssrv_cmd.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/responder/nss/nsssrv_cmd.c b/src/responder/nss/nsssrv_cmd.c
+index ec25611237f89ec7c6466a1a0e321d4067e45147..036e88f4c0428dd592b8067d7ec341728ef38ddb 100644
+--- a/src/responder/nss/nsssrv_cmd.c
++++ b/src/responder/nss/nsssrv_cmd.c
+@@ -1869,6 +1869,8 @@ static int fill_members(struct sss_packet *packet,
+         memnum++;
+     }
+ 
++    ret = 0;
++
+ done:
+     *_memnum = memnum;
+     *_rzero = rzero;
+@@ -2689,7 +2691,7 @@ static void nss_cmd_getgrgid_cb(struct tevent_req *req)
+     ret = nss_cmd_getgrgid_search(dctx);
+     if (ret == EOK) {
+         /* we have results to return */
+-        ret = nss_cmd_getpw_send_reply(dctx, true);
++        ret = nss_cmd_getgr_send_reply(dctx, true);
+     }
+ 
+ done:
+-- 
+1.7.12.1
+
diff --git a/sssd.spec b/sssd.spec
index 647b764..f2ec081 100644
--- a/sssd.spec
+++ b/sssd.spec
@@ -16,7 +16,7 @@
 
 Name: sssd
 Version: 1.9.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
 License: GPLv3+
@@ -26,6 +26,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 ### Patches ###
 Patch0001:  0001-LDAP-Check-validity-of-naming_context.patch
+Patch0002:  0002-Fix-two-errors-in-the-nss-responder.patch
 Patch0501:  0501-FEDORA-Switch-the-default-ccache-location.patch
 
 ### Dependencies ###
@@ -526,6 +527,9 @@ fi
 %postun -n libsss_sudo -p /sbin/ldconfig
 
 %changelog
+* Tue Oct 30 2012 Jakub Hrozek <jhrozek@redhat.com> - 1.9.2-5
+- Resolve groups from AD correctly
+
 * Tue Oct 30 2012 Jakub Hrozek <jhrozek@redhat.com> - 1.9.2-4
 - Check the validity of naming context