[nss-pam-ldapd] Update to 0.8.12, part 4

[Nalin Dahyabhai]

commit d117d3163d48441e72226f5946fe1b31e95119b0
Author: Nalin Dahyabhai <nalin at redhat.com>
Date:   Thu Jan 17 18:32:36 2013 -0500

    Update to 0.8.12, part 4
    
    Merge two patches for cutting down EPIPE errors in nslcd into one, and
    try to cover other cases where the client doesn't flush its read buffer
    before hanging up on the server.

 nss-pam-ldapd-0.7.16-skipall.patch |   95 ----------------------------------
 nss-pam-ldapd-0.7.x-epipe.patch    |  100 ------------------------------------
 nss-pam-ldapd-0.8.12-epipe.patch   |   20 +++++++
 nss-pam-ldapd.spec                 |    4 +-
 4 files changed, 21 insertions(+), 198 deletions(-)
---
diff --git a/nss-pam-ldapd-0.8.12-epipe.patch b/nss-pam-ldapd-0.8.12-epipe.patch
new file mode 100644
index 0000000..d9a38ef
--- /dev/null
+++ b/nss-pam-ldapd-0.8.12-epipe.patch
@@ -0,0 +1,20 @@
+Try to reduce EPIPE errors in nslcd by reading any pending data before closing
+our connection to the daemon, in the cases where we weren't already doing that.
+--- nss-pam-ldapd-0.8.12/nss/common.h
++++ nss-pam-ldapd-0.8.12/nss/common.h
+@@ -148,6 +148,7 @@
+   NSS_AVAILCHECK; \
+   if (fp!=NULL) \
+   { \
++    (void)tio_skipall(fp); \
+     (void)tio_close(fp); \
+     fp=NULL; \
+   } \
+@@ -182,6 +183,7 @@
+       /* reset failed, we close and give up with a permanent error \
+          because we cannot retry just the getent() call because it \
+          may not be only the first entry that failed */ \
++      tio_skipall(fp); \
+       tio_close(fp); \
+       fp=NULL; \
+       *errnop=EINVAL; \
diff --git a/nss-pam-ldapd.spec b/nss-pam-ldapd.spec
index c873f9c..2212b87 100644
--- a/nss-pam-ldapd.spec
+++ b/nss-pam-ldapd.spec
@@ -26,8 +26,7 @@ Source3:	nslcd.tmpfiles
 Source4:	nslcd.service
 Patch1:		nss-pam-ldapd-0.8.12-validname.patch
 Patch3:		nss-pam-ldapd-0.8.12-uid-overflow.patch
-Patch4:		nss-pam-ldapd-0.7.x-epipe.patch
-Patch5:		nss-pam-ldapd-0.7.16-skipall.patch
+Patch4:		nss-pam-ldapd-0.8.12-epipe.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	openldap-devel, krb5-devel
 BuildRequires:	autoconf, automake
@@ -68,7 +67,6 @@ nsswitch module.
 %patch1 -p0 -b .validname
 %patch3 -p1 -b .overflow
 %patch4 -p1 -b .epipe
-%patch5 -p1 -b .skipall
 autoreconf -f -i
 
 %build