rpms/nss_ldap/devel nss_ldap-265-erange.patch, NONE, 1.1 nss_ldap.spec, 1.119, 1.120

[Nalin Dahyabhai]

Author: nalin

Update of /cvs/pkgs/rpms/nss_ldap/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10318

Modified Files:
	nss_ldap.spec 
Added Files:
	nss_ldap-265-erange.patch 
Log Message:
- add proposed patch for upstream #421: sometimes errno gets reset before we
  return control to libc


nss_ldap-265-erange.patch:
 ldap-nss.c |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE nss_ldap-265-erange.patch ---
If we were supposed to set ERANGE, do so again, in case do_close() or
_nss_ldap_leave() overwrote errno with some other value.  Upstream #421.

diff -up nss_ldap-265/ldap-nss.ce nss_ldap-265/ldap-nss.c
--- nss_ldap-265/ldap-nss.ce	2010-07-08 16:17:07.000000000 -0400
+++ nss_ldap-265/ldap-nss.c	2010-07-08 16:17:03.000000000 -0400
@@ -3572,6 +3572,10 @@ _nss_ldap_getbyname (ldap_args_t * args,
 
   debug ("<== _nss_ldap_getbyname");
 
+  /* at least for the cases where we know we have to return ERANGE */
+  if (stat == NSS_TRYAGAIN)
+    do_map_errno(stat, errnop);
+
   return stat;
 }
 


Index: nss_ldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss_ldap/devel/nss_ldap.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- nss_ldap.spec	25 Mar 2010 22:58:06 -0000	1.119
+++ nss_ldap.spec	8 Jul 2010 20:40:29 -0000	1.120
@@ -3,7 +3,7 @@
 Summary: NSS library and PAM module for LDAP
 Name: nss_ldap
 Version: 265
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://www.padl.com/OSS/nss_ldap.html
 License: LGPLv2+
 Group: System Environment/Base
@@ -22,6 +22,7 @@ Patch21: nss_ldap-264-checkcase.patch
 Patch22: nss_ldap-265-ent_internal.patch
 Patch24: nss_ldap-264-cloexec.patch
 Patch25: nss_ldap-265-local_users.patch
+Patch26: nss_ldap-265-erange.patch
 
 BuildRequires: autoconf, automake, libtool
 BuildRequires: openssl-devel, openssl-static
@@ -50,6 +51,7 @@ cp %{SOURCE5} .
 %patch22 -p1 -b .ent_internal
 %patch24 -p1 -b .cloexec
 %patch25 -p1 -b .local_users
+%patch26 -p1 -b .erange
 sed -i -e 's,^ldap.conf$,%{name}.conf,g' *.5
 sed -i -e 's,^/etc/ldap\.,/etc/%{name}.,g' *.5
 sed -i -e 's,ldap.secret,%{name}.secret,g' *.5
@@ -146,6 +148,10 @@ fi
 %attr(0600,root,root) %ghost %config(noreplace) /etc/%{name}.secret
 
 %changelog
+* Thu Jul  8 2010 Nalin Dahyabhai <nalin at redhat.com> 265-5
+- add proposed patch for upstream #421: sometimes errno gets reset before we
+  return control to libc
+
 * Fri Feb 19 2010 Nalin Dahyabhai <nalin at redhat.com> 265-4
 - make mentions of nss_ldap.conf and %%{name}.conf more consistent (rcritten)