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.c17
-rw-r--r--nis/nss_nis/nis-ethers.c29
-rw-r--r--nis/nss_nis/nis-grp.c36
-rw-r--r--nis/nss_nis/nis-hosts.c13
-rw-r--r--nis/nss_nis/nis-network.c12
-rw-r--r--nis/nss_nis/nis-proto.c36
-rw-r--r--nis/nss_nis/nis-pwd.c18
-rw-r--r--nis/nss_nis/nis-rpc.c9
-rw-r--r--nis/nss_nis/nis-service.c8
-rw-r--r--nis/nss_nis/nis-spwd.c24
10 files changed, 89 insertions, 113 deletions
diff --git a/nis/nss_nis/nis-alias.c b/nis/nss_nis/nis-alias.c
index 80c49ff5dd..e187716bb0 100644
--- a/nis/nss_nis/nis-alias.c
+++ b/nis/nss_nis/nis-alias.c
@@ -184,9 +184,10 @@ internal_nis_getaliasent_r (struct aliasent *alias, char *buffer,
++p;
free (result);
- parse_res = _nss_nis_parse_aliasent (outkey, p, alias, buffer, buflen);
- if (parse_res == -1)
+ if ((parse_res = _nss_nis_parse_aliasent (outkey, p, alias,
+ buffer, buflen)) == -1)
{
+ free (outkey);
__set_errno (ERANGE);
return NSS_STATUS_TRYAGAIN;
}
@@ -258,12 +259,12 @@ _nss_nis_getaliasbyname_r (const char *name, struct aliasent *alias,
free (result);
alias->alias_local = 0;
- parse_res = _nss_nis_parse_aliasent (name, p, alias, buffer, buflen);
- if (parse_res == -1)
+ if ((parse_res = _nss_nis_parse_aliasent (name, p, alias, buffer,
+ buflen)) == -1)
return NSS_STATUS_TRYAGAIN;
+
+ if (parse_res)
+ return NSS_STATUS_SUCCESS;
else
- if (parse_res == 0)
- return NSS_STATUS_NOTFOUND;
- else
- return NSS_STATUS_SUCCESS;
+ return NSS_STATUS_NOTFOUND;
}
diff --git a/nis/nss_nis/nis-ethers.c b/nis/nss_nis/nis-ethers.c
index 149910bfab..e54262409c 100644
--- a/nis/nss_nis/nis-ethers.c
+++ b/nis/nss_nis/nis-ethers.c
@@ -159,17 +159,16 @@ internal_nis_getetherent_r (struct ether *eth, char *buffer, size_t buflen)
if (next == NULL)
return NSS_STATUS_NOTFOUND;
p = strcpy (buffer, next->val);
- next = next->next;
while (isspace (*p))
++p;
- parse_res = _nss_files_parse_etherent (p, eth, data, buflen);
- if (!parse_res && errno == ERANGE)
- return NSS_STATUS_TRYAGAIN;
+ if ((parse_res = _nss_files_parse_etherent (p, eth, data, buflen)) == -1)
+ return NSS_STATUS_TRYAGAIN;
+ next = next->next;
}
while (!parse_res);
-
+
return NSS_STATUS_SUCCESS;
}
@@ -228,15 +227,11 @@ _nss_nis_gethostton_r (const char *name, struct ether *eth,
++p;
free (result);
- parse_res = _nss_files_parse_etherent (p, eth, data, buflen);
+ if ((parse_res = _nss_files_parse_etherent (p, eth, data, buflen)) == -1)
+ return NSS_STATUS_TRYAGAIN;
if (!parse_res)
- {
- if (errno == ERANGE)
- return NSS_STATUS_TRYAGAIN;
- else
- return NSS_STATUS_NOTFOUND;
- }
+ return NSS_STATUS_NOTFOUND;
else
return NSS_STATUS_SUCCESS;
}
@@ -291,15 +286,11 @@ _nss_nis_getntohost_r (struct ether_addr *addr, struct ether *eth,
++p;
free (result);
- parse_res = _nss_files_parse_etherent (p, eth, data, buflen);
+ if ((parse_res = _nss_files_parse_etherent (p, eth, data, buflen)) == -1)
+ return NSS_STATUS_TRYAGAIN;
if (!parse_res)
- {
- if (errno == ERANGE)
- return NSS_STATUS_TRYAGAIN;
- else
- return NSS_STATUS_NOTFOUND;
- }
+ return NSS_STATUS_NOTFOUND;
else
return NSS_STATUS_SUCCESS;
}
diff --git a/nis/nss_nis/nis-grp.c b/nis/nss_nis/nis-grp.c
index 9577499670..7897e21881 100644
--- a/nis/nss_nis/nis-grp.c
+++ b/nis/nss_nis/nis-grp.c
@@ -121,9 +121,11 @@ internal_nis_getgrent_r (struct group *grp, char *buffer, size_t buflen)
++p;
free (result);
- parse_res = _nss_files_parse_grent (p, grp, data, buflen);
- if (parse_res < 1 && errno == ERANGE)
- return NSS_STATUS_TRYAGAIN;
+ if ((parse_res = _nss_files_parse_grent (p, grp, data, buflen)) == -1)
+ {
+ free (outkey);
+ return NSS_STATUS_TRYAGAIN;
+ }
free (oldkey);
oldkey = outkey;
@@ -190,17 +192,13 @@ _nss_nis_getgrnam_r (const char *name, struct group *grp,
++p;
free (result);
- parse_res = _nss_files_parse_grent (p, grp, data, buflen);
+ if ((parse_res = _nss_files_parse_grent (p, grp, data, buflen)) == -1)
+ return NSS_STATUS_TRYAGAIN;
- if (parse_res < 1)
- {
- if (errno == ERANGE)
- return NSS_STATUS_TRYAGAIN;
- else
- return NSS_STATUS_NOTFOUND;
- }
- else
+ if (parse_res)
return NSS_STATUS_SUCCESS;
+ else
+ return NSS_STATUS_NOTFOUND;
}
enum nss_status
@@ -241,15 +239,11 @@ _nss_nis_getgrgid_r (gid_t gid, struct group *grp,
++p;
free (result);
- parse_res = _nss_files_parse_grent (p, grp, data, buflen);
+ if ((parse_res = _nss_files_parse_grent (p, grp, data, buflen)) == -1)
+ return NSS_STATUS_TRYAGAIN;
- if (parse_res < 1)
- {
- if (errno == ERANGE)
- return NSS_STATUS_TRYAGAIN;
- else
- return NSS_STATUS_NOTFOUND;
- }
- else
+ if (parse_res)
return NSS_STATUS_SUCCESS;
+ else
+ return NSS_STATUS_NOTFOUND;
}
diff --git a/nis/nss_nis/nis-hosts.c b/nis/nss_nis/nis-hosts.c
index d26b4f5ccc..da7cef5ada 100644
--- a/nis/nss_nis/nis-hosts.c
+++ b/nis/nss_nis/nis-hosts.c
@@ -199,9 +199,9 @@ internal_nis_gethostent_r (struct hostent *host, char *buffer,
++p;
free (result);
- parse_res = parse_line (p, host, data, buflen);
- if (!parse_res && errno == ERANGE)
+ if ((parse_res = parse_line (p, host, data, buflen)) == -1)
{
+ free (outkey);
*h_errnop = NETDB_INTERNAL;;
return NSS_STATUS_TRYAGAIN;
}
@@ -287,9 +287,9 @@ _nss_nis_gethostbyname2_r (const char *name, int af, struct hostent *host,
parse_res = parse_line (p, host, data, buflen);
- if (!parse_res || host->h_addrtype != af)
+ if (parse_res < 1 || host->h_addrtype != af)
{
- if (!parse_res && errno == ERANGE)
+ if (parse_res == -1)
{
*h_errnop = NETDB_INTERNAL;
return NSS_STATUS_TRYAGAIN;
@@ -377,10 +377,9 @@ _nss_nis_gethostbyaddr_r (char *addr, int addrlen, int type,
free (result);
parse_res = parse_line (p, host, data, buflen);
-
- if (!parse_res)
+ if (parse_res < 1)
{
- if (errno == ERANGE)
+ if (parse_res == -1)
{
*h_errnop = NETDB_INTERNAL;
return NSS_STATUS_TRYAGAIN;
diff --git a/nis/nss_nis/nis-network.c b/nis/nss_nis/nis-network.c
index 284e479401..c17ba81a62 100644
--- a/nis/nss_nis/nis-network.c
+++ b/nis/nss_nis/nis-network.c
@@ -126,9 +126,9 @@ internal_nis_getnetent_r (struct netent *net, char *buffer, size_t buflen,
++p;
free (result);
- parse_res = _nss_files_parse_netent (p, net, data, buflen);
- if (!parse_res && errno == ERANGE)
+ if ((parse_res = _nss_files_parse_netent (p, net, data, buflen)) == -1)
{
+ free (outkey);
*herrnop = NETDB_INTERNAL;
return NSS_STATUS_TRYAGAIN;
}
@@ -206,10 +206,10 @@ _nss_nis_getnetbyname_r (const char *name, struct netent *net,
parse_res = _nss_files_parse_netent (p, net, data, buflen);
- if (!parse_res)
+ if (parse_res < 1)
{
*herrnop = NETDB_INTERNAL;
- if (errno == ERANGE)
+ if (parse_res == -1)
return NSS_STATUS_TRYAGAIN;
else
return NSS_STATUS_NOTFOUND;
@@ -286,10 +286,10 @@ _nss_nis_getnetbyaddr_r (unsigned long addr, int type, struct netent *net,
parse_res = _nss_files_parse_netent (p, net, data, buflen);
- if (!parse_res)
+ if (parse_res < 1)
{
*herrnop = NETDB_INTERNAL;
- if (errno == ERANGE)
+ if (parse_res == -1)
return NSS_STATUS_TRYAGAIN;
else
return NSS_STATUS_NOTFOUND;
diff --git a/nis/nss_nis/nis-proto.c b/nis/nss_nis/nis-proto.c
index ceed40e036..eb09bb4ec7 100644
--- a/nis/nss_nis/nis-proto.c
+++ b/nis/nss_nis/nis-proto.c
@@ -152,17 +152,17 @@ internal_nis_getprotoent_r (struct protoent *proto,
if (next == NULL)
return NSS_STATUS_NOTFOUND;
p = strcpy (buffer, next->val);
- next = next->next;
while (isspace (*p))
++p;
- parse_res = _nss_files_parse_protoent (p, proto, data, buflen);
- if (!parse_res && errno == ERANGE)
+ if ((parse_res = _nss_files_parse_protoent (p, proto, data,
+ buflen)) == -1)
return NSS_STATUS_TRYAGAIN;
+ next = next->next;
}
while (!parse_res);
-
+
return NSS_STATUS_SUCCESS;
}
@@ -221,17 +221,13 @@ _nss_nis_getprotobyname_r (const char *name, struct protoent *proto,
++p;
free (result);
- parse_res = _nss_files_parse_protoent (p, proto, data, buflen);
+ if ((parse_res = _nss_files_parse_protoent (p, proto, data, buflen)) == -1)
+ return NSS_STATUS_TRYAGAIN;
- if (!parse_res)
- {
- if (errno == ERANGE)
- return NSS_STATUS_TRYAGAIN;
- else
- return NSS_STATUS_NOTFOUND;
- }
- else
+ if (parse_res)
return NSS_STATUS_SUCCESS;
+ else
+ return NSS_STATUS_NOTFOUND;
}
enum nss_status
@@ -272,15 +268,11 @@ _nss_nis_getprotobynumber_r (int number, struct protoent *proto,
++p;
free (result);
- parse_res = _nss_files_parse_protoent (p, proto, data, buflen);
+ if ((parse_res = _nss_files_parse_protoent (p, proto, data, buflen)) == -1)
+ return NSS_STATUS_TRYAGAIN;
- if (!parse_res)
- {
- if (errno == ERANGE)
- return NSS_STATUS_TRYAGAIN;
- else
- return NSS_STATUS_NOTFOUND;
- }
- else
+ if (parse_res)
return NSS_STATUS_SUCCESS;
+ else
+ return NSS_STATUS_NOTFOUND;
}
diff --git a/nis/nss_nis/nis-pwd.c b/nis/nss_nis/nis-pwd.c
index 39c2948b65..f693db17ea 100644
--- a/nis/nss_nis/nis-pwd.c
+++ b/nis/nss_nis/nis-pwd.c
@@ -121,16 +121,18 @@ internal_nis_getpwent_r (struct passwd *pwd, char *buffer, size_t buflen)
++p;
free (result);
- parse_res = _nss_files_parse_pwent (p, pwd, data, buflen);
- if (!parse_res && errno == ERANGE)
- return NSS_STATUS_TRYAGAIN;
+ if ((parse_res = _nss_files_parse_pwent (p, pwd, data, buflen)) == -1)
+ {
+ free (outkey);
+ return NSS_STATUS_TRYAGAIN;
+ }
free (oldkey);
oldkey = outkey;
oldkeylen = keylen;
new_start = 0;
}
- while (!parse_res);
+ while (parse_res < 1);
return NSS_STATUS_SUCCESS;
}
@@ -192,9 +194,9 @@ _nss_nis_getpwnam_r (const char *name, struct passwd *pwd,
parse_res = _nss_files_parse_pwent (p, pwd, data, buflen);
- if (!parse_res)
+ if (parse_res < 1)
{
- if (errno == ERANGE)
+ if (parse_res == -1)
return NSS_STATUS_TRYAGAIN;
else
return NSS_STATUS_NOTFOUND;
@@ -243,9 +245,9 @@ _nss_nis_getpwuid_r (uid_t uid, struct passwd *pwd,
parse_res = _nss_files_parse_pwent (p, pwd, data, buflen);
- if (!parse_res)
+ if (parse_res < 1)
{
- if (errno == ERANGE)
+ if (parse_res == -1)
return NSS_STATUS_TRYAGAIN;
else
return NSS_STATUS_NOTFOUND;
diff --git a/nis/nss_nis/nis-rpc.c b/nis/nss_nis/nis-rpc.c
index 073284865e..cd1f0db9b5 100644
--- a/nis/nss_nis/nis-rpc.c
+++ b/nis/nss_nis/nis-rpc.c
@@ -169,13 +169,12 @@ internal_nis_getrpcent_r (struct rpcent *rpc, char *buffer, size_t buflen,
if (data->next == NULL)
return NSS_STATUS_NOTFOUND;
p = strcpy (buffer, data->next->val);
- data->next = data->next->next;
while (isspace (*p))
++p;
- parse_res = _nss_files_parse_rpcent (p, rpc, pdata, buflen);
- if (!parse_res && errno == ERANGE)
+ if ((parse_res = _nss_files_parse_rpcent (p, rpc, pdata, buflen)) == -1)
return NSS_STATUS_TRYAGAIN;
+ data->next = data->next->next;
}
while (!parse_res);
@@ -286,9 +285,9 @@ _nss_nis_getrpcbynumber_r (int number, struct rpcent *rpc,
parse_res = _nss_files_parse_rpcent (p, rpc, data, buflen);
- if (!parse_res)
+ if (parse_res < 1)
{
- if (errno == ERANGE)
+ if (parse_res == -1)
return NSS_STATUS_TRYAGAIN;
else
return NSS_STATUS_NOTFOUND;
diff --git a/nis/nss_nis/nis-service.c b/nis/nss_nis/nis-service.c
index 054bc33169..5ec89c8677 100644
--- a/nis/nss_nis/nis-service.c
+++ b/nis/nss_nis/nis-service.c
@@ -169,13 +169,13 @@ internal_nis_getservent_r (struct servent *serv, char *buffer,
if (data->next == NULL)
return NSS_STATUS_NOTFOUND;
p = strcpy (buffer, data->next->val);
- data->next = data->next->next;
- while (isspace (*p))
+ while (isspace (*p))
++p;
- parse_res = _nss_files_parse_servent (p, serv, buffer, buflen);
- if (!parse_res && errno == ERANGE)
+ if ((parse_res = _nss_files_parse_servent (p, serv, buffer,
+ buflen)) == -1)
return NSS_STATUS_TRYAGAIN;
+ data->next = data->next->next;
}
while (!parse_res);
diff --git a/nis/nss_nis/nis-spwd.c b/nis/nss_nis/nis-spwd.c
index 21221fd7e5..0263f4e313 100644
--- a/nis/nss_nis/nis-spwd.c
+++ b/nis/nss_nis/nis-spwd.c
@@ -121,10 +121,12 @@ internal_nis_getspent_r (struct spwd *sp, char *buffer, size_t buflen)
++p;
free (result);
- parse_res = _nss_files_parse_spent (p, sp, data, buflen);
- if (!parse_res && errno == ERANGE)
- return NSS_STATUS_TRYAGAIN;
-
+ if ((parse_res = _nss_files_parse_spent (p, sp, data, buflen)) == -1)
+ {
+ free (outkey);
+ return NSS_STATUS_TRYAGAIN;
+ }
+
free (oldkey);
oldkey = outkey;
oldkeylen = keylen;
@@ -190,15 +192,11 @@ _nss_nis_getspnam_r (const char *name, struct spwd *sp,
++p;
free (result);
- parse_res = _nss_files_parse_spent (p, sp, data, buflen);
+ if ((parse_res = _nss_files_parse_spent (p, sp, data, buflen)) == -1)
+ return NSS_STATUS_TRYAGAIN;
- if (!parse_res)
- {
- if (errno == ERANGE)
- return NSS_STATUS_TRYAGAIN;
- else
- return NSS_STATUS_NOTFOUND;
- }
- else
+ if (parse_res)
return NSS_STATUS_SUCCESS;
+ else
+ return NSS_STATUS_NOTFOUND;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-17 01:17:04 +0000