From 807d19ed0c1bc9c5306058deb50d6c779c53adb0 Mon Sep 17 00:00:00 2001 From: Nalin Dahyabhai Date: Fri, 18 Jan 2013 15:54:18 -0500 Subject: [PATCH] drop an obsolete local patch drop local patch to make the client flush some more read buffers --- nss-pam-ldapd-0.8.12-epipe.patch | 20 -------------------- nss-pam-ldapd.spec | 7 ++++--- 2 files changed, 4 insertions(+), 23 deletions(-) delete mode 100644 nss-pam-ldapd-0.8.12-epipe.patch diff --git a/nss-pam-ldapd-0.8.12-epipe.patch b/nss-pam-ldapd-0.8.12-epipe.patch deleted file mode 100644 index d9a38ef..0000000 --- a/nss-pam-ldapd-0.8.12-epipe.patch +++ /dev/null @@ -1,20 +0,0 @@ -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 d658d05..b1ff954 100644 --- a/nss-pam-ldapd.spec +++ b/nss-pam-ldapd.spec @@ -34,7 +34,7 @@ Name: nss-pam-ldapd Version: 0.8.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An nsswitch module which uses directory servers Group: System Environment/Base License: LGPLv2+ @@ -46,7 +46,6 @@ 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.8.12-epipe.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openldap-devel, krb5-devel BuildRequires: autoconf, automake @@ -95,7 +94,6 @@ nsswitch module. %setup -q %patch1 -p0 -b .validname %patch3 -p1 -b .overflow -%patch4 -p1 -b .epipe autoreconf -f -i %build @@ -321,6 +319,9 @@ exit 0 %endif %changelog +* Fri Jan 18 2013 Nalin Dahyabhai 0.8.12-2 +- drop local patch to make the client flush some more read buffers + * Fri Jan 18 2013 Nalin Dahyabhai 0.8.12-1 - update to 0.8.12 (#846793) - make building pam_ldap conditional on the targeted release