Fix a number of compiler warnings

This includes a number of small fixes for issues that were formerly
masked by the incorrect AC_LANG_PROGRAM check.

19 files changed, 35 insertions, 34 deletions

diff --git a/compat/ldap_parse_passwordpolicy_control.c b/compat/ldap_parse_passwordpolicy_control.c
index 3517085..de8dd8d 100644
--- a/compat/ldap_parse_passwordpolicy_control.c
+++ b/compat/ldap_parse_passwordpolicy_control.c
@@ -46,7 +46,7 @@
 
 int ldap_parse_passwordpolicy_control(LDAP UNUSED(*ld), LDAPControl *ctrl,
                                       ber_int_t *expirep, ber_int_t *gracep,
-                                      LDAPPasswordPolicyError *errorp)
+                                      LDAPPasswordPolicyError UNUSED(*errorp))
 {
   BerElement *ber;
   ber_tag_t tag;
diff --git a/nslcd/common.c b/nslcd/common.c
index 211be1b..ade9ca6 100644
--- a/nslcd/common.c
+++ b/nslcd/common.c
@@ -238,8 +238,8 @@ int write_address(TFILE *fp, MYLDAP_ENTRY *entry, const char *attr,
     /* failure, log but write simple invalid address
        (otherwise the address list is messed up) */
     /* TODO: have error message in correct format */
-    log_log(LOG_WARNING, "%s: %s: \"%s\" unparseble",
-            myldap_get_dn(entry), attmap_ether_cn, addr);
+    log_log(LOG_WARNING, "%s: %s: \"%s\" unparsable",
+            myldap_get_dn(entry), attr, addr);
     /* write an illegal address type */
     WRITE_INT32(fp, -1);
     /* write an emtpy address */
diff --git a/nslcd/config.c b/nslcd/config.c
index 36efede..75c9ec1 100644
--- a/nslcd/config.c
+++ b/nslcd/config.c
@@ -1,7 +1,7 @@
 /*
    config.c - routines for getting configuration information
 
-   Copyright (C) 2012 Arthur de Jong
+   Copyright (C) 2012, 2013 Arthur de Jong
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -33,7 +33,7 @@
 #include "log.h"
 #include "cfg.h"
 
-int nslcd_config_get(TFILE *fp, MYLDAP_SESSION *session)
+int nslcd_config_get(TFILE *fp, MYLDAP_SESSION UNUSED(*session))
 {
   int32_t tmpint32;
   int32_t cfgopt;
diff --git a/nslcd/group.c b/nslcd/group.c
index e4ff55a..4fd40bf 100644
--- a/nslcd/group.c
+++ b/nslcd/group.c
@@ -136,8 +136,7 @@ static int mkfilter_group_bymember(MYLDAP_SESSION *session,
                     attmap_group_member, safedn);
 }
 
-static int mkfilter_group_bymemberdn(MYLDAP_SESSION *session,
-                                     const char *dn,
+static int mkfilter_group_bymemberdn(const char *dn,
                                      char *buffer, size_t buflen)
 {
   char safedn[300];
@@ -481,7 +480,7 @@ int nslcd_group_bymember(TFILE *fp, MYLDAP_SESSION *session)
     while ((dn = set_pop(tocheck)) != NULL)
     {
       /* make filter for finding groups with our group as member */
-      if (mkfilter_group_bymemberdn(session, dn, filter, sizeof(filter)))
+      if (mkfilter_group_bymemberdn(dn, filter, sizeof(filter)))
       {
         log_log(LOG_WARNING, "nslcd_group_bymember(): filter buffer too small");
         set_free(seen);
diff --git a/nslcd/nslcd.c b/nslcd/nslcd.c
index ffa6bea..b5881c4 100644
--- a/nslcd/nslcd.c
+++ b/nslcd/nslcd.c
@@ -250,7 +250,7 @@ static int create_socket(const char *filename)
     log_log(LOG_ERR, "cannot create socket: %s", strerror(errno));
     exit(EXIT_FAILURE);
   }
-  if (sock >= FD_SETSIZE)
+  if (sock >= (int)FD_SETSIZE)
   {
     log_log(LOG_ERR, "socket file descriptor number too high (%d)", sock);
     exit(EXIT_FAILURE);
diff --git a/nslcd/pam.c b/nslcd/pam.c
index bdd8729..2593c7c 100644
--- a/nslcd/pam.c
+++ b/nslcd/pam.c
@@ -546,7 +546,7 @@ int nslcd_pam_authz(TFILE *fp, MYLDAP_SESSION *session)
   return 0;
 }
 
-int nslcd_pam_sess_o(TFILE *fp, MYLDAP_SESSION *session)
+int nslcd_pam_sess_o(TFILE *fp, MYLDAP_SESSION UNUSED(*session))
 {
   int32_t tmpint32;
   char username[256], service[64], ruser[256], rhost[HOST_NAME_MAX + 1], tty[64];
@@ -554,7 +554,7 @@ int nslcd_pam_sess_o(TFILE *fp, MYLDAP_SESSION *session)
   static const char alphabet[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
                                  "abcdefghijklmnopqrstuvwxyz"
                                  "01234567890";
-  int i;
+  unsigned int i;
   /* read request parameters */
   READ_STRING(fp, username);
   READ_STRING(fp, service);
@@ -579,7 +579,7 @@ int nslcd_pam_sess_o(TFILE *fp, MYLDAP_SESSION *session)
   return 0;
 }
 
-int nslcd_pam_sess_c(TFILE *fp, MYLDAP_SESSION *session)
+int nslcd_pam_sess_c(TFILE *fp, MYLDAP_SESSION UNUSED(*session))
 {
   int32_t tmpint32;
   char username[256], service[64], ruser[256], rhost[HOST_NAME_MAX + 1], tty[64];
diff --git a/nslcd/protocol.c b/nslcd/protocol.c
index a2a31da..d37c903 100644
--- a/nslcd/protocol.c
+++ b/nslcd/protocol.c
@@ -5,7 +5,7 @@
 
    Copyright (C) 1997-2005 Luke Howard
    Copyright (C) 2006 West Consulting
-   Copyright (C) 2006, 2007, 2009, 2010, 2011, 2012 Arthur de Jong
+   Copyright (C) 2006, 2007, 2009, 2010, 2011, 2012, 2013 Arthur de Jong
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -150,7 +150,7 @@ static int write_protocol(TFILE *fp, MYLDAP_ENTRY *entry, const char *reqname)
             myldap_get_dn(entry), attmap_protocol_ipProtocolNumber);
     return 0;
   }
-  else if ((errno != 0) || (proto < 0) || (proto > UINT8_MAX))
+  else if ((errno != 0) || (proto < 0) || (proto > (long)UINT8_MAX))
   {
     log_log(LOG_WARNING, "%s: %s: out of range",
             myldap_get_dn(entry), attmap_protocol_ipProtocolNumber);
diff --git a/nslcd/rpc.c b/nslcd/rpc.c
index e022154..ba88f4e 100644
--- a/nslcd/rpc.c
+++ b/nslcd/rpc.c
@@ -5,7 +5,7 @@
 
    Copyright (C) 1997-2005 Luke Howard
    Copyright (C) 2006 West Consulting
-   Copyright (C) 2006, 2007, 2009, 2010, 2011, 2012 Arthur de Jong
+   Copyright (C) 2006, 2007, 2009, 2010, 2011, 2012, 2013 Arthur de Jong
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -105,7 +105,7 @@ static int write_rpc(TFILE *fp, MYLDAP_ENTRY *entry, const char *reqname)
   const char **aliases;
   const char **numbers;
   char *tmp;
-  long number;
+  unsigned long number;
   int i;
   /* get the most canonical name */
   name = myldap_get_rdn_value(entry, attmap_rpc_cn);
diff --git a/nslcd/service.c b/nslcd/service.c
index 187bce0..673aac4 100644
--- a/nslcd/service.c
+++ b/nslcd/service.c
@@ -173,7 +173,7 @@ static int write_service(TFILE *fp, MYLDAP_ENTRY *entry,
             myldap_get_dn(entry), attmap_service_ipServicePort);
     return 0;
   }
-  else if ((errno != 0) || (port <= 0) || (port > UINT16_MAX))
+  else if ((errno != 0) || (port <= 0) || (port > (long)UINT16_MAX))
   {
     log_log(LOG_WARNING, "%s: %s: out of range",
             myldap_get_dn(entry), attmap_service_ipServicePort);
diff --git a/nss/bsdnss.c b/nss/bsdnss.c
index e2037ba..85c62b8 100644
--- a/nss/bsdnss.c
+++ b/nss/bsdnss.c
@@ -6,7 +6,7 @@
    Copyright (C) 2003 Jacques Vidrine
    Copyright (C) 2006 Artem Kazakov
    Copyright (C) 2009 Alexander V. Chernikov
-   Copyright (C) 2011, 2012 Arthur de Jong
+   Copyright (C) 2011, 2012, 2013 Arthur de Jong
    Copyright (C) 2011 Tom Judge
 
    This library is free software; you can redistribute it and/or
@@ -85,7 +85,7 @@ static ns_mtab methods[] = {
   { NSDB_PASSWD_COMPAT, "endpwent",   __nss_compat_endpwent,   _nss_ldap_endpwent },
 };
 
-int __nss_compat_gethostbyname(void *retval, void *mdata, va_list ap)
+int __nss_compat_gethostbyname(void UNUSED(*retval), void *mdata, va_list ap)
 {
   nss_status_t (*fn)(const char *, struct hostent *, char *, size_t, int *, int *);
   const char *name;
@@ -105,7 +105,7 @@ int __nss_compat_gethostbyname(void *retval, void *mdata, va_list ap)
   return status;
 }
 
-int __nss_compat_gethostbyname2(void *retval, void *mdata, va_list ap)
+int __nss_compat_gethostbyname2(void UNUSED(*retval), void *mdata, va_list ap)
 {
   nss_status_t (*fn)(const char *, struct hostent *, char *, size_t, int *, int *);
   const char *name;
@@ -125,7 +125,7 @@ int __nss_compat_gethostbyname2(void *retval, void *mdata, va_list ap)
   return status;
 }
 
-int __nss_compat_gethostbyaddr(void *retval, void *mdata, va_list ap)
+int __nss_compat_gethostbyaddr(void UNUSED(*retval), void *mdata, va_list ap)
 {
   struct in_addr *addr;
   int len;
@@ -165,7 +165,8 @@ static int __gr_addgid(gid_t gid, gid_t *groups, int maxgrp, int *groupc)
   return ret;
 }
 
-int __freebsd_getgroupmembership(void *retval, void *mdata, va_list ap)
+int __freebsd_getgroupmembership(void UNUSED(*retval), void UNUSED(*mdata_),
+                                 va_list ap)
 {
   int err;
   nss_status_t s;
@@ -199,7 +200,7 @@ int __freebsd_getgroupmembership(void *retval, void *mdata, va_list ap)
   return __nss_compat_result(s, 0);
 }
 
-ns_mtab *nss_module_register(const char *source, unsigned int *mtabsize,
+ns_mtab *nss_module_register(const char UNUSED(*source), unsigned int *mtabsize,
                              nss_module_unregister_fn *unreg)
 {
   *mtabsize = sizeof(methods) / sizeof(methods[0]);
diff --git a/nss/ethers.c b/nss/ethers.c
index 9273fc4..b094a66 100644
--- a/nss/ethers.c
+++ b/nss/ethers.c
@@ -107,7 +107,7 @@ static char *etherent2str(struct etherent *result, char *buffer,
   int res;
   res = snprintf(buffer, buflen, "%s %s", ether_ntoa(&result->e_addr),
                  result->e_name);
-  if ((res < 0) || (res >= buflen))
+  if ((res < 0) || (res >= (int)buflen))
     return NULL;
   return buffer;
 }
diff --git a/nss/group.c b/nss/group.c
index c00b086..5945718 100644
--- a/nss/group.c
+++ b/nss/group.c
@@ -194,7 +194,7 @@ static char *group2str(struct group *result, char *buffer, size_t buflen)
   int res, i;
   res = snprintf(buffer, buflen, "%s:%s:%d:", result->gr_name,
                  result->gr_passwd, (int)result->gr_gid);
-  if ((res < 0) || (res >= buflen))
+  if ((res < 0) || (res >= (int)buflen))
     return NULL;
   if (result->gr_mem)
     for (i = 0; result->gr_mem[i]; i++)
diff --git a/nss/netgroup.c b/nss/netgroup.c
index 3777c4c..bd70768 100644
--- a/nss/netgroup.c
+++ b/nss/netgroup.c
@@ -321,7 +321,8 @@ static nss_backend_op_t netgroup_setnetgrent_ops[] = {
   netgroup_setnetgrent_getnetgrent,
 };
 
-static nss_status_t netgroup_setnetgrent_constructor(nss_backend_t *be, void *args)
+static nss_status_t netgroup_setnetgrent_constructor(nss_backend_t UNUSED(*be),
+                                                     void *args)
 {
   struct setnetgrent_backend *ngbe;
   nss_status_t retv;
diff --git a/nss/networks.c b/nss/networks.c
index 4130205..6d12ca6 100644
--- a/nss/networks.c
+++ b/nss/networks.c
@@ -170,7 +170,7 @@ static char *netent2str(struct netent *result, char *buffer, size_t buflen)
   struct in_addr priv_in_addr;
   priv_in_addr.s_addr = result->n_net;
   res = snprintf(buffer, buflen, "%s %s", result->n_name, inet_ntoa(priv_in_addr));
-  if ((res < 0) || (res >= buflen))
+  if ((res < 0) || (res >= (int)buflen))
     return NULL;
   if (result->n_aliases)
     for (i = 0; result->n_aliases[i]; i++)
diff --git a/nss/passwd.c b/nss/passwd.c
index 8e69692..c17d8cc 100644
--- a/nss/passwd.c
+++ b/nss/passwd.c
@@ -106,7 +106,7 @@ static char *passwd2str(struct passwd *result, char *buffer, size_t buflen)
                  result->pw_name, result->pw_passwd, (int)result->pw_uid,
                  (int)result->pw_gid, result->pw_gecos, result->pw_dir,
                  result->pw_shell);
-  if ((res < 0) || (res >= buflen))
+  if ((res < 0) || (res >= (int)buflen))
     return NULL;
   return buffer;
 }
diff --git a/nss/protocols.c b/nss/protocols.c
index 7787161..4944dff 100644
--- a/nss/protocols.c
+++ b/nss/protocols.c
@@ -98,7 +98,7 @@ static char *protoent2str(struct protoent *result, char *buffer, size_t buflen)
 {
   int res, i;
   res = snprintf(buffer, buflen, "%s\t\t%d", result->p_name, result->p_proto);
-  if ((res < 0) || (res >= buflen))
+  if ((res < 0) || (res >= (int)buflen))
     return NULL;
   if (result->p_aliases)
     for (i = 0; result->p_aliases[i]; i++)
diff --git a/nss/rpc.c b/nss/rpc.c
index d116a9b..6b0bcc8 100644
--- a/nss/rpc.c
+++ b/nss/rpc.c
@@ -97,7 +97,7 @@ static char *rpcent2str(struct rpcent *result, char *buffer, size_t buflen)
 {
   int res, i;
   res = snprintf(buffer, buflen, "%s %d", result->r_name, result->r_number);
-  if ((res < 0) || (res >= buflen))
+  if ((res < 0) || (res >= (int)buflen))
     return NULL;
   if (result->r_aliases)
     for (i = 0; result->r_aliases[i]; i++)
diff --git a/nss/services.c b/nss/services.c
index a83a6ec..a2df9cb 100644
--- a/nss/services.c
+++ b/nss/services.c
@@ -106,7 +106,7 @@ static char *servent2str(struct servent *result, char *buffer, size_t buflen)
   int res, i;
   res = snprintf(buffer, buflen, "%s %d/%s", result->s_name, result->s_port,
                  result->s_proto);
-  if ((res < 0) || (res >= buflen))
+  if ((res < 0) || (res >= (int)buflen))
     return NULL;
   if (result->s_aliases)
     for (i = 0; result->s_aliases[i]; i++)
diff --git a/pam/pam.c b/pam/pam.c
index 2b67c73..36caf11 100644
--- a/pam/pam.c
+++ b/pam/pam.c
@@ -270,8 +270,8 @@ static int nslcd2pam_rc(pam_handle_t *pamh, int rc)
 }
 
 /* check whether the specified user is handled by nslcd */
-static int nslcd_request_exists(pam_handle_t *pamh, struct pld_ctx *ctx,
-                                struct pld_cfg *cfg, const char *username)
+static int nslcd_request_exists(pam_handle_t *pamh, struct pld_cfg *cfg,
+                                const char *username)
 {
   PAM_REQUEST(
     NSLCD_ACTION_PASSWD_BYNAME,
@@ -675,7 +675,7 @@ int pam_sm_chauthtok(pam_handle_t *pamh, int flags,
     return remap_pam_rc(PAM_PERM_DENIED, &cfg);
   }
   /* see if we are dealing with an LDAP user first */
-  rc = nslcd_request_exists(pamh, ctx, &cfg, username);
+  rc = nslcd_request_exists(pamh, &cfg, username);
   if (rc != PAM_SUCCESS)
     return remap_pam_rc(rc, &cfg);
   /* preliminary check, just see if we can authenticate with the current password */