nss-pam-ldapd commit: r1248 - nss-pam-ldapd-solaris/nss

[Commits of the nss-pam-ldapd project <nss-pam-ldapd-commits [at] lists.arthurdejong.org>]

Author: arthur
Date: Sat Oct  9 20:15:40 2010
New Revision: 1248
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?view=rev&revision=1248

Log:
re-introduce rename of protoentfp to serventfp which was introduced in r1246 
and accidentally lost in r1247

Modified:
   nss-pam-ldapd-solaris/nss/services.c

Modified: nss-pam-ldapd-solaris/nss/services.c
==============================================================================
--- nss-pam-ldapd-solaris/nss/services.c        Sat Oct  9 19:26:31 2010        
(r1247)
+++ nss-pam-ldapd-solaris/nss/services.c        Sat Oct  9 20:15:40 2010        
(r1248)
@@ -31,7 +31,7 @@
 #include "compat/attrs.h"
 
 /* thread-local file pointer to an ongoing request */
-static __thread TFILE *protoentfp;
+static __thread TFILE *serventfp;
 
 /* read a single services result entry from the stream */
 static nss_status_t read_servent(
@@ -80,7 +80,7 @@
 /* open request to get all services */
 nss_status_t _nss_ldap_setservent(int UNUSED(stayopen))
 {
-  NSS_SETENT(protoentfp);
+  NSS_SETENT(serventfp);
 }
 
 /* read a single returned service definition */
@@ -88,15 +88,15 @@
         struct servent *result,
         char *buffer,size_t buflen,int *errnop)
 {
-  NSS_GETENT(protoentfp,NSLCD_ACTION_SERVICE_ALL,buffer,buflen,
-             read_servent(protoentfp,result,buffer,buflen,errnop));
+  NSS_GETENT(serventfp,NSLCD_ACTION_SERVICE_ALL,buffer,buflen,
+             read_servent(serventfp,result,buffer,buflen,errnop));
   return retv;
 }
 
 /* close the stream opened by setservent() above */
 nss_status_t _nss_ldap_endservent(void)
 {
-  NSS_ENDENT(protoentfp);
+  NSS_ENDENT(serventfp);
 }
 
 #endif /* NSS_FLAVOUR_GLIBC */
@@ -125,20 +125,20 @@
 
 static nss_status_t _xnss_ldap_setservent(nss_backend_t UNUSED(*be),void 
UNUSED(*args))
 {
-  NSS_SETENT(protoentfp);
+  NSS_SETENT(serventfp);
 }
 
 static nss_status_t _nss_nslcd_getservent_r(
         struct servent *result,char *buffer,size_t buflen,int *errnop)
 {
-  NSS_GETENT(protoentfp,NSLCD_ACTION_SERVICE_ALL,buffer,buflen,
-             read_servent(protoentfp,result,buffer,buflen,errnop));
+  NSS_GETENT(serventfp,NSLCD_ACTION_SERVICE_ALL,buffer,buflen,
+             read_servent(serventfp,result,buffer,buflen,errnop));
   return retv;
 }
 
 static nss_status_t _xnss_ldap_endservent(nss_backend_t UNUSED(*be),void 
UNUSED(*args))
 {
-  NSS_ENDENT(protoentfp);
+  NSS_ENDENT(serventfp);
 }
 
 static nss_status_t _xnss_ldap_getservbyname_r(nss_backend_t UNUSED(*be),void 
*args)
--
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits