summaryrefslogtreecommitdiff
path: root/nis/nss_nis
diff options
context:
space:
mode:
Diffstat (limited to 'nis/nss_nis')
-rw-r--r--nis/nss_nis/nis-alias.c4
-rw-r--r--nis/nss_nis/nis-ethers.c6
-rw-r--r--nis/nss_nis/nis-grp.c6
-rw-r--r--nis/nss_nis/nis-hosts.c6
-rw-r--r--nis/nss_nis/nis-network.c6
-rw-r--r--nis/nss_nis/nis-proto.c6
-rw-r--r--nis/nss_nis/nis-pwd.c6
-rw-r--r--nis/nss_nis/nis-rpc.c4
-rw-r--r--nis/nss_nis/nis-service.c9
-rw-r--r--nis/nss_nis/nis-spwd.c4
10 files changed, 32 insertions, 25 deletions
diff --git a/nis/nss_nis/nis-alias.c b/nis/nss_nis/nis-alias.c
index af83d9cd7c..df884d6faa 100644
--- a/nis/nss_nis/nis-alias.c
+++ b/nis/nss_nis/nis-alias.c
@@ -172,7 +172,7 @@ internal_nis_getaliasent_r (struct aliasent *alias, char *buffer,
return retval;
}
- if (len + 1 > buflen)
+ if ((size_t) (len + 1) > buflen)
{
free (result);
__set_errno (ERANGE);
@@ -244,7 +244,7 @@ _nss_nis_getaliasbyname_r (const char *name, struct aliasent *alias,
return retval;
}
- if (len + 1 > buflen)
+ if ((size_t) (len + 1) > buflen)
{
free (result);
__set_errno (ERANGE);
diff --git a/nis/nss_nis/nis-ethers.c b/nis/nss_nis/nis-ethers.c
index 26449720bb..ae3ba76adf 100644
--- a/nis/nss_nis/nis-ethers.c
+++ b/nis/nss_nis/nis-ethers.c
@@ -107,7 +107,7 @@ internal_nis_getetherent_r (struct ether *eth, char *buffer, size_t buflen)
return retval;
}
- if (len + 1 > buflen)
+ if ((size_t) (len + 1) > buflen)
{
free (result);
__set_errno (ERANGE);
@@ -175,7 +175,7 @@ _nss_nis_getethernam_r (const char *name, struct ether *eth,
return retval;
}
- if (len + 1 > buflen)
+ if ((size_t) (len + 1) > buflen)
{
free (result);
__set_errno (ERANGE);
@@ -237,7 +237,7 @@ _nss_nis_getetherbyaddr_r (struct ether_addr *addr, struct ether *eth,
return retval;
}
- if (len + 1 > buflen)
+ if ((size_t) (len + 1) > buflen)
{
free (result);
__set_errno (ERANGE);
diff --git a/nis/nss_nis/nis-grp.c b/nis/nss_nis/nis-grp.c
index 1bab862c2f..72de8b3c83 100644
--- a/nis/nss_nis/nis-grp.c
+++ b/nis/nss_nis/nis-grp.c
@@ -101,7 +101,7 @@ internal_nis_getgrent_r (struct group *grp, char *buffer, size_t buflen)
return retval;
}
- if (len + 1 > buflen)
+ if ((size_t) (len + 1) > buflen)
{
free (result);
__set_errno (ERANGE);
@@ -169,7 +169,7 @@ _nss_nis_getgrnam_r (const char *name, struct group *grp,
return retval;
}
- if (len + 1 > buflen)
+ if ((size_t) (len + 1) > buflen)
{
free (result);
__set_errno (ERANGE);
@@ -219,7 +219,7 @@ _nss_nis_getgrgid_r (gid_t gid, struct group *grp,
return retval;
}
- if (len + 1 > buflen)
+ if ((size_t) (len + 1) > buflen)
{
free (result);
__set_errno (ERANGE);
diff --git a/nis/nss_nis/nis-hosts.c b/nis/nss_nis/nis-hosts.c
index 9adce18ca3..bab7f4c5f4 100644
--- a/nis/nss_nis/nis-hosts.c
+++ b/nis/nss_nis/nis-hosts.c
@@ -195,7 +195,7 @@ internal_nis_gethostent_r (struct hostent *host, char *buffer,
return retval;
}
- if (len + 1 > linebuflen)
+ if ((size_t) (len + 1) > linebuflen)
{
free (result);
*h_errnop = NETDB_INTERNAL;
@@ -281,7 +281,7 @@ _nss_nis_gethostbyname_r (const char *name, struct hostent *host,
return retval;
}
- if (len + 1 > linebuflen)
+ if ((size_t) (len + 1) > linebuflen)
{
free (result);
*h_errnop = NETDB_INTERNAL;
@@ -354,7 +354,7 @@ _nss_nis_gethostbyaddr_r (char *addr, int addrlen, int type,
return retval;
}
- if (len + 1 > linebuflen)
+ if ((size_t) (len + 1) > linebuflen)
{
free (result);
__set_errno (ERANGE);
diff --git a/nis/nss_nis/nis-network.c b/nis/nss_nis/nis-network.c
index 2795feb421..e82b40143e 100644
--- a/nis/nss_nis/nis-network.c
+++ b/nis/nss_nis/nis-network.c
@@ -106,7 +106,7 @@ internal_nis_getnetent_r (struct netent *net, char *buffer, size_t buflen,
return retval;
}
- if (len + 1 > buflen)
+ if ((size_t) (len + 1) > buflen)
{
free (result);
__set_errno (ERANGE);
@@ -183,7 +183,7 @@ _nss_nis_getnetbyname_r (const char *name, struct netent *net,
return retval;
}
- if (len + 1 > buflen)
+ if ((size_t) (len + 1) > buflen)
{
free (result);
__set_errno (ERANGE);
@@ -261,7 +261,7 @@ _nss_nis_getnetbyaddr_r (unsigned long addr, int type, struct netent *net,
}
}
- if (len + 1 > buflen)
+ if ((size_t) (len + 1) > buflen)
{
free (result);
__set_errno (ERANGE);
diff --git a/nis/nss_nis/nis-proto.c b/nis/nss_nis/nis-proto.c
index f62dfb1492..6feae63258 100644
--- a/nis/nss_nis/nis-proto.c
+++ b/nis/nss_nis/nis-proto.c
@@ -101,7 +101,7 @@ internal_nis_getprotoent_r (struct protoent *proto,
return retval;
}
- if (len + 1 > buflen)
+ if ((size_t) (len + 1) > buflen)
{
free (result);
__set_errno (ERANGE);
@@ -169,7 +169,7 @@ _nss_nis_getprotobyname_r (const char *name, struct protoent *proto,
return retval;
}
- if (len + 1 > buflen)
+ if ((size_t) (len + 1) > buflen)
{
free (result);
__set_errno (ERANGE);
@@ -219,7 +219,7 @@ _nss_nis_getprotobynumber_r (int number, struct protoent *proto,
return retval;
}
- if (len + 1 > buflen)
+ if ((size_t) (len + 1) > buflen)
{
free (result);
__set_errno (ERANGE);
diff --git a/nis/nss_nis/nis-pwd.c b/nis/nss_nis/nis-pwd.c
index afcc7a428e..752f7032a6 100644
--- a/nis/nss_nis/nis-pwd.c
+++ b/nis/nss_nis/nis-pwd.c
@@ -101,7 +101,7 @@ internal_nis_getpwent_r (struct passwd *pwd, char *buffer, size_t buflen)
return retval;
}
- if (len + 1 > buflen)
+ if ((size_t) (len + 1) > buflen)
{
free (result);
__set_errno (ERANGE);
@@ -169,7 +169,7 @@ _nss_nis_getpwnam_r (const char *name, struct passwd *pwd,
return retval;
}
- if (len + 1 > buflen)
+ if ((size_t) (len + 1) > buflen)
{
free (result);
__set_errno (ERANGE);
@@ -219,7 +219,7 @@ _nss_nis_getpwuid_r (uid_t uid, struct passwd *pwd,
return retval;
}
- if (len + 1 > buflen)
+ if ((size_t) (len + 1) > buflen)
{
free (result);
__set_errno (ERANGE);
diff --git a/nis/nss_nis/nis-rpc.c b/nis/nss_nis/nis-rpc.c
index 91f54be3a9..a549076537 100644
--- a/nis/nss_nis/nis-rpc.c
+++ b/nis/nss_nis/nis-rpc.c
@@ -128,7 +128,7 @@ internal_nis_getrpcent_r (struct rpcent *rpc, char *buffer, size_t buflen,
return retval;
}
- if (len + 1 > buflen)
+ if ((size_t) (len + 1) > buflen)
{
free (result);
__set_errno (ERANGE);
@@ -243,7 +243,7 @@ _nss_nis_getrpcbynumber_r (int number, struct rpcent *rpc,
return retval;
}
- if (len + 1 > buflen)
+ if ((size_t) (len + 1) > buflen)
{
free (result);
__set_errno (ERANGE);
diff --git a/nis/nss_nis/nis-service.c b/nis/nss_nis/nis-service.c
index 03a9fbf48e..6d07479ee2 100644
--- a/nis/nss_nis/nis-service.c
+++ b/nis/nss_nis/nis-service.c
@@ -28,6 +28,13 @@
#include "nss-nis.h"
+
+/* The parser is defined in a different module. */
+extern int _nss_files_parse_servent (char *line, struct servent *result,
+ char *data, size_t datalen);
+
+
+
__libc_lock_define_initialized (static, lock)
struct intern_t
@@ -127,7 +134,7 @@ internal_nis_getservent_r (struct servent *serv, char *buffer,
return retval;
}
- if (len + 1 > buflen)
+ if ((size_t) (len + 1) > buflen)
{
free (result);
__set_errno (ERANGE);
diff --git a/nis/nss_nis/nis-spwd.c b/nis/nss_nis/nis-spwd.c
index 928489245b..b5f8c3afd2 100644
--- a/nis/nss_nis/nis-spwd.c
+++ b/nis/nss_nis/nis-spwd.c
@@ -101,7 +101,7 @@ internal_nis_getspent_r (struct spwd *sp, char *buffer, size_t buflen)
return retval;
}
- if (len + 1 > buflen)
+ if ((size_t) (len + 1) > buflen)
{
free (result);
__set_errno (ERANGE);
@@ -169,7 +169,7 @@ _nss_nis_getspnam_r (const char *name, struct spwd *sp,
return retval;
}
- if (len + 1 > buflen)
+ if ((size_t) (len + 1) > buflen)
{
free (result);
__set_errno (ERANGE);