merge changes from trunk

git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd-solaris@1257 ef36b2f9-881f-0410-afb5-c4e39611909c

3 files changed, 12 insertions, 12 deletions

diff --git a/nslcd/myldap.c b/nslcd/myldap.c
index 365f10a..9c97244 100644
--- a/nslcd/myldap.c
+++ b/nslcd/myldap.c
@@ -464,7 +464,7 @@ static int do_bind(MYLDAP_SESSION *session,const char *uri)
 #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)
 {
diff --git a/nss/rpc.c b/nss/rpc.c
index f9ceab9..4788462 100644
--- a/nss/rpc.c
+++ b/nss/rpc.c
@@ -68,12 +68,12 @@ nss_status_t _nss_ldap_getrpcbynumber_r(
 }
 
 /* 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 @@ nss_status_t _nss_ldap_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;
 }
 
 /* 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 @@ static nss_status_t _nss_nslcd_getrpcbynumber_r(
 }
 
 /* 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)
diff --git a/pam/pam.c b/pam/pam.c
index f179bd9..3d30368 100644
--- a/pam/pam.c
+++ b/pam/pam.c
@@ -92,7 +92,7 @@ static void ctx_clear(struct pld_ctx *ctx)
 }
 
 /* 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);