nss-pam-ldapd commit: r1257 - in nss-pam-ldapd-solaris: . nslcd nss pam

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

Author: arthur
Date: Sun Oct 10 22:05:43 2010
New Revision: 1257
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?view=rev&revision=1257

Log:
merge changes from trunk

Modified:
   nss-pam-ldapd-solaris/   (props changed)
   nss-pam-ldapd-solaris/nslcd/myldap.c
   nss-pam-ldapd-solaris/nss/rpc.c
   nss-pam-ldapd-solaris/pam/pam.c

Modified: nss-pam-ldapd-solaris/nslcd/myldap.c
==============================================================================
--- nss-pam-ldapd-solaris/nslcd/myldap.c        Sun Oct 10 21:57:22 2010        
(r1256)
+++ nss-pam-ldapd-solaris/nslcd/myldap.c        Sun Oct 10 22:05:43 2010        
(r1257)
@@ -464,7 +464,7 @@
 #ifdef HAVE_LDAP_SET_REBIND_PROC
 /* This function is called by the LDAP library when chasing referrals.
    It is configured with the ldap_set_rebind_proc() below. */
-static int do_rebind(LDAP *UNUSED(ld),LDAP_CONST char *url,
+static int do_rebind(LDAP UNUSED(*ld),LDAP_CONST char *url,
                      ber_tag_t UNUSED(request),
                      ber_int_t UNUSED(msgid),void *arg)
 {

Modified: nss-pam-ldapd-solaris/nss/rpc.c
==============================================================================
--- nss-pam-ldapd-solaris/nss/rpc.c     Sun Oct 10 21:57:22 2010        (r1256)
+++ nss-pam-ldapd-solaris/nss/rpc.c     Sun Oct 10 22:05:43 2010        (r1257)
@@ -68,12 +68,12 @@
 }
 
 /* thread-local file pointer to an ongoing request */
-static __thread TFILE *protoentfp;
+static __thread TFILE *rpcentfp;
 
 /* request a stream to list all rpc entries */
 nss_status_t _nss_ldap_setrpcent(int UNUSED(stayopen))
 {
-  NSS_SETENT(protoentfp);
+  NSS_SETENT(rpcentfp);
 }
 
 /* get an rpc entry from the list */
@@ -81,15 +81,15 @@
         struct rpcent *result,
         char *buffer,size_t buflen,int *errnop)
 {
-  NSS_GETENT(protoentfp,NSLCD_ACTION_RPC_ALL,buffer,buflen,
-             read_rpcent(protoentfp,result,buffer,buflen,errnop));
+  NSS_GETENT(rpcentfp,NSLCD_ACTION_RPC_ALL,buffer,buflen,
+             read_rpcent(rpcentfp,result,buffer,buflen,errnop));
   return retv;
 }
 
 /* close the stream opened by setrpcent() above */
 nss_status_t _nss_ldap_endrpcent(void)
 {
-  NSS_ENDENT(protoentfp);
+  NSS_ENDENT(rpcentfp);
 }
 
 #endif /* NSS_FLAVOUR_GLIBC */
@@ -117,24 +117,24 @@
 }
 
 /* thread-local file pointer to an ongoing request */
-static __thread TFILE *protoentfp;
+static __thread TFILE *rpcentfp;
 
 static nss_status_t _xnss_ldap_setrpcent(nss_backend_t UNUSED(*be),void 
UNUSED(*args))
 {
-  NSS_SETENT(protoentfp);
+  NSS_SETENT(rpcentfp);
 }
 
 static nss_status_t _nss_nslcd_getrpcent_r(
         struct rpcent *result,char *buffer,size_t buflen,int *errnop)
 {
-  NSS_GETENT(protoentfp,NSLCD_ACTION_RPC_ALL,buffer,buflen,
-             read_rpcent(protoentfp,result,buffer,buflen,errnop));
+  NSS_GETENT(rpcentfp,NSLCD_ACTION_RPC_ALL,buffer,buflen,
+             read_rpcent(rpcentfp,result,buffer,buflen,errnop));
   return retv;
 }
 
 static nss_status_t _xnss_ldap_endrpcent(nss_backend_t UNUSED(*be),void 
UNUSED(*args))
 {
-  NSS_ENDENT(protoentfp);
+  NSS_ENDENT(rpcentfp);
 }
 
 static nss_status_t _xnss_ldap_getrpcbyname_r(nss_backend_t UNUSED(*be),void 
*args)

Modified: nss-pam-ldapd-solaris/pam/pam.c
==============================================================================
--- nss-pam-ldapd-solaris/pam/pam.c     Sun Oct 10 21:57:22 2010        (r1256)
+++ nss-pam-ldapd-solaris/pam/pam.c     Sun Oct 10 22:05:43 2010        (r1257)
@@ -92,7 +92,7 @@
 }
 
 /* free the context (this is installed as handler into PAM) */
-static void ctx_free(pam_handle_t *UNUSED(pamh),void *data,int UNUSED(err))
+static void ctx_free(pam_handle_t UNUSED(*pamh),void *data,int UNUSED(err))
 {
   struct pld_ctx *ctx=data;
   ctx_clear(ctx);
--
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits