diff options
Diffstat (limited to 'nis')
-rw-r--r-- | nis/Makefile | 2 | ||||
-rw-r--r-- | nis/nis_call.c | 15 | ||||
-rw-r--r-- | nis/nss_compat/compat-grp.c | 2 | ||||
-rw-r--r-- | nis/nss_compat/compat-pwd.c | 2 | ||||
-rw-r--r-- | nis/nss_compat/compat-spwd.c | 2 | ||||
-rw-r--r-- | nis/nss_nisplus/nisplus-hosts.c | 3 | ||||
-rw-r--r-- | nis/nss_nisplus/nisplus-network.c | 2 | ||||
-rw-r--r-- | nis/nss_nisplus/nisplus-proto.c | 2 | ||||
-rw-r--r-- | nis/nss_nisplus/nisplus-rpc.c | 2 | ||||
-rw-r--r-- | nis/nss_nisplus/nisplus-service.c | 2 |
10 files changed, 18 insertions, 16 deletions
diff --git a/nis/Makefile b/nis/Makefile index fe4dd94..64925bb 100644 --- a/nis/Makefile +++ b/nis/Makefile @@ -30,7 +30,7 @@ databases = proto service hosts network grp pwd rpc ethers \ spwd netgrp alias publickey # Specify rules for the nss_* modules. -services := nis compat nisplus +services := nis nisplus compat extra-libs = libnsl $(services:%=libnss_%) # These libraries will be built in the `others' pass rather than diff --git a/nis/nis_call.c b/nis/nis_call.c index 78e8767..12b3ab2 100644 --- a/nis/nis_call.c +++ b/nis/nis_call.c @@ -113,7 +113,7 @@ __nis_dobind (const nis_server *server, u_long flags) } else continue; - + clnt_sock = RPC_ANYSOCK; if ((flags & USE_DGRAM) == USE_DGRAM) client = clntudp_create (&clnt_saddr, NIS_PROG, NIS_VERSION, @@ -121,7 +121,7 @@ __nis_dobind (const nis_server *server, u_long flags) else client = clnttcp_create (&clnt_saddr, NIS_PROG, NIS_VERSION, &clnt_sock, 0, 0); - + if (client == NULL) continue; if (clnt_call (client, 0, (xdrproc_t) xdr_void, NULL, @@ -138,7 +138,7 @@ __nis_dobind (const nis_server *server, u_long flags) { char netname[MAXNETNAMELEN+1]; char *p; - + p = stpcpy (netname, "unix."); strncpy (p, server->name,MAXNETNAMELEN-5); netname[MAXNETNAMELEN] = '\0'; @@ -155,7 +155,7 @@ __nis_dobind (const nis_server *server, u_long flags) } return client; } - + return NULL; } @@ -167,7 +167,8 @@ __do_niscall (const nis_server *serv, int serv_len, u_long prog, CLIENT *clnt; directory_obj *dir = NULL; const nis_server *server; - int try, result, server_len; + int try, result; + unsigned int server_len; if (serv == NULL || serv_len == 0) { @@ -195,10 +196,10 @@ __do_niscall (const nis_server *serv, int serv_len, u_long prog, while (try < MAXTRIES && result != RPC_SUCCESS) { unsigned int i; - + if ((flags & HARD_LOOKUP) == 0) ++try; - + for (i = 0; i < server_len; i++) { if ((clnt = __nis_dobind (&server[i], flags)) == NULL) diff --git a/nis/nss_compat/compat-grp.c b/nis/nss_compat/compat-grp.c index 372212d..68f852d 100644 --- a/nis/nss_compat/compat-grp.c +++ b/nis/nss_compat/compat-grp.c @@ -360,7 +360,7 @@ getgrent_next_file_plusgroup (struct group *result, char *buffer, != YPERR_SUCCESS) return NSS_STATUS_TRYAGAIN; p = strncpy (buffer, outval, - buflen < outvallen ? buflen : outvallen); + buflen < (size_t) outvallen ? buflen : (size_t) outvallen); free (outval); while (isspace (*p)) p++; diff --git a/nis/nss_compat/compat-pwd.c b/nis/nss_compat/compat-pwd.c index 194b332..b47a8b1 100644 --- a/nis/nss_compat/compat-pwd.c +++ b/nis/nss_compat/compat-pwd.c @@ -677,7 +677,7 @@ getpwent_next_file_plususer (struct passwd *result, char *buffer, != YPERR_SUCCESS) return NSS_STATUS_TRYAGAIN; p = strncpy (buffer, outval, - buflen < outvallen ? buflen : outvallen); + buflen < (size_t) outvallen ? buflen : (size_t) outvallen); free (outval); while (isspace (*p)) p++; diff --git a/nis/nss_compat/compat-spwd.c b/nis/nss_compat/compat-spwd.c index 74967f8..30c4e40 100644 --- a/nis/nss_compat/compat-spwd.c +++ b/nis/nss_compat/compat-spwd.c @@ -630,7 +630,7 @@ getspent_next_file_plususer (struct spwd *result, char *buffer, != YPERR_SUCCESS) return NSS_STATUS_TRYAGAIN; p = strncpy (buffer, outval, - buflen < outvallen ? buflen : outvallen); + buflen < (size_t) outvallen ? buflen : (size_t) outvallen); free (outval); while (isspace (*p)) p++; diff --git a/nis/nss_nisplus/nisplus-hosts.c b/nis/nss_nisplus/nisplus-hosts.c index 1bcbe40..c933ae4 100644 --- a/nis/nss_nisplus/nisplus-hosts.c +++ b/nis/nss_nisplus/nisplus-hosts.c @@ -117,7 +117,8 @@ _nss_nisplus_parse_hostent (nis_result *result, struct hostent *host, { char *p = buffer; size_t room_left = buflen; - int parse_res, i; + int parse_res; + unsigned int i; struct parser_data *data = (void *) buffer; if (result == NULL) diff --git a/nis/nss_nisplus/nisplus-network.c b/nis/nss_nisplus/nisplus-network.c index 7e0ccd6..7f849e2 100644 --- a/nis/nss_nisplus/nisplus-network.c +++ b/nis/nss_nisplus/nisplus-network.c @@ -65,7 +65,7 @@ _nss_nisplus_parse_netent (nis_result *result, struct netent *network, { char *p = buffer; size_t room_left = buflen; - int i; + unsigned int i; struct parser_data *data = (void *) buffer; if (result == NULL) diff --git a/nis/nss_nisplus/nisplus-proto.c b/nis/nss_nisplus/nisplus-proto.c index 5cb55d3..1399748 100644 --- a/nis/nss_nisplus/nisplus-proto.c +++ b/nis/nss_nisplus/nisplus-proto.c @@ -56,7 +56,7 @@ _nss_nisplus_parse_protoent (nis_result * result, struct protoent *proto, { char *p = buffer; size_t room_left = buflen; - int i; + unsigned int i; struct parser_data *data = (void *) buffer; if (result == NULL) diff --git a/nis/nss_nisplus/nisplus-rpc.c b/nis/nss_nisplus/nisplus-rpc.c index 9cf9f68..435da57 100644 --- a/nis/nss_nisplus/nisplus-rpc.c +++ b/nis/nss_nisplus/nisplus-rpc.c @@ -56,7 +56,7 @@ _nss_nisplus_parse_rpcent (nis_result *result, struct rpcent *rpc, { char *p = buffer; size_t room_left = buflen; - int i; + unsigned int i; struct parser_data *data = (void *) buffer; if (result == NULL) diff --git a/nis/nss_nisplus/nisplus-service.c b/nis/nss_nisplus/nisplus-service.c index 1a8716a..c95507a 100644 --- a/nis/nss_nisplus/nisplus-service.c +++ b/nis/nss_nisplus/nisplus-service.c @@ -59,7 +59,7 @@ _nss_nisplus_parse_servent (nis_result *result, struct servent *serv, { char *p = buffer; size_t room_left = buflen; - int i; + unsigned int i; struct parser_data *data = (void *) buffer; if (result == NULL) |