aboutsummaryrefslogtreecommitdiff
path: root/nis/nss_nisplus/nisplus-ethers.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1997-07-22 00:10:33 +0000
committerUlrich Drepper <drepper@redhat.com>1997-07-22 00:10:33 +0000
commit60c966358ed6fa6ce3ded5426f46232cbfd8e0fd (patch)
tree2edfd4ad681692a2dbfdfcabaead5bca25ed2be5 /nis/nss_nisplus/nisplus-ethers.c
parent907a1bacf996264c3197342cfc565b1d4f840bfb (diff)
downloadglibc-60c966358ed6fa6ce3ded5426f46232cbfd8e0fd.zip
glibc-60c966358ed6fa6ce3ded5426f46232cbfd8e0fd.tar.gz
glibc-60c966358ed6fa6ce3ded5426f46232cbfd8e0fd.tar.bz2
1997-07-22 01:35 Ulrich Drepper <drepper@cygnus.com> * Makerules (+make-deps): Use $(CFLAGS) in run of $(+mkdep) so that optimizing is also selected for dependency generation. * configure.in: Add machine description for TI c[34]x. * inet/Makefile (routines): Remove ntohl and ntohs. * inet/netinet/in.h: Use optimized version of hton? and ntoh? for little endian machines. * sysdeps/alpha/ntohl.s: Removed. * sysdeps/alpha/ntohs.s: Removed. * sysdeps/generic/ntohl.c: Removed. * sysdeps/generic/ntohs.c: Removed. * sysdeps/generic/htonl.c: Add aliases for ntohl. * sysdeps/vax/htonl.s: Likewise. * sysdeps/generic/htons.c: Add aliases for ntohs. * sysdeps/vax/htons.s: Likewise. * sysdeps/vax/ntohl.s: Removed. * sysdeps/vax/ntohs.s: Removed. * sysdeps/generic/bits/htontoh.h: New file. * sysdeps/i386/htonl.S: New file. * sysdeps/i386/htons.S: New file. * sysdeps/i386/i486/htonl.S: New file. * sysdeps/i386/fpu/bits/mathinline.h: Correct and optimized compare macros. * sysdeps/mips/dl-machine.h: Remove mips64 dependent parts. * sysdeps/mips/mips64/dl-machine.h: New file. * sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Don't install syscall-list.h. 1997-07-12 Andreas Jaeger <aj@arthur.rhein-neckar.de> * libc.map: Add missing symbol _obstack. 1997-07-14 08:22 H.J. Lu <hjl@gnu.ai.mit.edu> * sysdeps/mips/rtld-parms: New. * sysdeps/unix/sysv/linux/mips/lxstat.h: Moved to * sysdeps/unix/sysv/linux/mips/lxstat.c: ...this. * sysdeps/unix/sysv/linux/mips/sgidef.h: Moved to * sysdeps/unix/sysv/linux/mips/sgidefs.h: ...this. * sysdeps/generic/dl-sysdep.c (_start): Change to ENTRY_POINT. 1997-07-17 08:39 H.J. Lu <hjl@gnu.ai.mit.edu> * sysdeps/mips/dl-machine.h: Remove extra stuff. 1997-07-06 07:18 Geoff Keating <geoffk@ozemail.com.au> * sysdeps/powerpc/bits/endian.h: Handle multiple endianess. * stdlib/grouping.h: Suppress gcc warning about testing unsigned char for less-than-zero. * stdio-common/printf_fp.c: Likewise. * stdio-common/vfprintf.c: Likewise. * sysdeps/powerpc/add_n.s: New file. * sysdeps/powerpc/sub_n.s: New file. * sysdeps/powerpc/lshift.s: Ported XCOFF->ELF (from GMP). * sysdeps/powerpc/mul_1.s: Ported XCOFF->ELF (from GMP). * sysdeps/powerpc/addmul_1.s: Ported XCOFF->ELF (from GMP). * sysdeps/powerpc/submul_1.s: Ported XCOFF->ELF (from GMP). * sysdeps/powerpc/rshift.s: Ported XCOFF->ELF (from GMP). * math/libm-test.c (cos_test, sin_test, sincos_test): Use precomputed pi/6 rather than having gcc calculate it, otherwise tests give inaccurate result due to inaccurate input. * math/libm.map: Add __fe_*_env constants to list of exported symbols. * sysdeps/libm-ieee754/s_isinf.c: Simplify, make faster. * sysdeps/libm-ieee754/s_isinff.c: Simplify, make faster. * sysdeps/libm-ieee754/s_atan2f.c: Correct value of pi to be correct round-to-nearest value. * sysdeps/libm-ieee754/e_log.c: Make sure exceptions are raised. * sysdeps/libm-ieee754/e_log10.c: Likewise. * sysdeps/libm-ieee754/e_log10f.c: Likewise. * sysdeps/libm-ieee754/e_logf.c: Likewise. * sysdeps/libm-ieee754/s_log1p.c: Likewise. Also use correct -Inf. * sysdeps/libm-ieee754/s_log1pf.c: Likewise. Also use correct -Inf. * sysdeps/libm-ieee754/s_log2.c: Likewise. * sysdeps/libm-ieee754/s_log2f.c: Likewise. 1997-07-15 21:54 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis/nss_compat/compat-grp.c: Fix "buffer to small" problems and memory leaks. * nis/nss_compat/compat-pwd.c: Likewise. * nis/nss_compat/compat-spwd.c: Likewise. * nis/nss_nis/nis-alias.c: Likewise. * nis/nss_nis/nis-ethers.c: Likewise. * nis/nss_nis/nis-grp.c: Likewise. * nis/nss_nis/nis-hosts.c: Likewise. * nis/nss_nis/nis-network.c: Likewise. * nis/nss_nis/nis-proto.c: Likewise. * nis/nss_nis/nis-pwd.c: Likewise. * nis/nss_nis/nis-rpc.c: Likewise. * nis/nss_nis/nis-service.c: Likewise. * nis/nss_nis/nis-spwd.c: Likewise. * nis/nss_nisplus-alias.c: Likewise. * nis/nss_nisplus-ethers.c: Likewise. * nis/nss_nisplus-grp.c: Likewise. * nis/nss_nisplus-hosts.c: Likewise. * nis/nss_nisplus-netgrp.c: Likewise. * nis/nss_nisplus-network.c: Likewise. * nis/nss_nisplus-proto.c: Likewise. * nis/nss_nisplus-pwd.c: Likewise. * nis/nss_nisplus-rpc.c: Likewise. * nis/nss_nisplus-service.c: Likewise. * nis/nss_nisplus-spwd.c: Likewise. * nis/nss_nisplus-parse.c: If buffer to small, give -1 back. 1997-07-20 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/dl-machine.h (elf_machine_rela): Mention program name in warning message. * sysdeps/powerpc/dl-machine.h (elf_machine_rela): Likewise. * sysdeps/sparc/dl-machine.h (elf_machine_rela): Likewise. * sysdeps/sparc64/dl-machine.h (elf_machine_rela): Likewise. * sysdeps/i386/dl-machine.h (elf_machine_rel): Print program name first. 1997-07-20 19:33 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * libc.map: Add _null_auth and _seterr_reply. * sunrpc/clnt_udp.c (clntudp_call): If xargs is NULL, don't encode it.
Diffstat (limited to 'nis/nss_nisplus/nisplus-ethers.c')
-rw-r--r--nis/nss_nisplus/nisplus-ethers.c75
1 files changed, 51 insertions, 24 deletions
diff --git a/nis/nss_nisplus/nisplus-ethers.c b/nis/nss_nisplus/nisplus-ethers.c
index 7c07833..d7c3720 100644
--- a/nis/nss_nisplus/nisplus-ethers.c
+++ b/nis/nss_nisplus/nisplus-ethers.c
@@ -74,7 +74,7 @@ _nss_nisplus_parse_etherent (nis_result *result, struct etherent *ether,
if (NISENTRYLEN (0, 0, result) +1 > room_left)
{
__set_errno (ERANGE);
- return 0;
+ return -1;
}
strncpy (p, NISENTRYVAL (0, 0, result), NISENTRYLEN (0, 0, result));
room_left -= (NISENTRYLEN (0, 0, result) +1);
@@ -152,8 +152,11 @@ internal_nisplus_getetherent_r (struct etherent *ether, char *buffer,
/* Get the next entry until we found a correct one. */
do
{
+ nis_result *saved_result;
+
if (result == NULL)
{
+ saved_result = NULL;
result = nis_first_entry(tablename_val);
if (niserr2nss (result->status) != NSS_STATUS_SUCCESS)
return niserr2nss (result->status);
@@ -163,13 +166,28 @@ internal_nisplus_getetherent_r (struct etherent *ether, char *buffer,
nis_result *res2;
res2 = nis_next_entry(tablename_val, &result->cookie);
- nis_freeresult (result);
+ saved_result = result;
result = res2;
if (niserr2nss (result->status) != NSS_STATUS_SUCCESS)
- return niserr2nss (result->status);
+ {
+ nis_freeresult (saved_result);
+ return niserr2nss (result->status);
+ }
}
- parse_res = _nss_nisplus_parse_etherent (result, ether, buffer, buflen);
+ if ((parse_res = _nss_nisplus_parse_etherent (result, ether, buffer,
+ buflen)) == -1)
+ {
+ nis_freeresult (result);
+ result = saved_result;
+ return NSS_STATUS_TRYAGAIN;
+ }
+ else
+ {
+ if (saved_result != NULL)
+ nis_freeresult (saved_result);
+ }
+
} while (!parse_res);
return NSS_STATUS_SUCCESS;
@@ -200,9 +218,7 @@ _nss_nisplus_gethostton_r (const char *name, struct etherent *eth,
if (_nss_create_tablename () != NSS_STATUS_SUCCESS)
return NSS_STATUS_UNAVAIL;
- if (name == NULL)
- return NSS_STATUS_NOTFOUND;
- else
+ if (name != NULL)
{
nis_result *result;
char buf[strlen (name) + 40 + tablename_len];
@@ -212,18 +228,23 @@ _nss_nisplus_gethostton_r (const char *name, struct etherent *eth,
result = nis_list(buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL);
if (niserr2nss (result->status) != NSS_STATUS_SUCCESS)
- return niserr2nss (result->status);
-
- parse_res = _nss_nisplus_parse_etherent (result, eth, buffer, buflen);
-
+ {
+ enum nss_status status = niserr2nss (result->status);
+ nis_freeresult (result);
+ return status;
+ }
+
+ if ((parse_res = _nss_nisplus_parse_etherent (result, eth, buffer,
+ buflen)) == -1)
+ {
+ nis_freeresult (result);
+ return NSS_STATUS_TRYAGAIN;
+ }
+
if (parse_res)
return NSS_STATUS_SUCCESS;
-
- if (!parse_res && errno == ERANGE)
- return NSS_STATUS_TRYAGAIN;
- else
- return NSS_STATUS_NOTFOUND;
}
+ return NSS_STATUS_NOTFOUND;
}
enum nss_status
@@ -255,16 +276,22 @@ _nss_nisplus_getntohost_r (const struct ether_addr *addr,
result = nis_list(buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL);
if (niserr2nss (result->status) != NSS_STATUS_SUCCESS)
- return niserr2nss (result->status);
-
- parse_res = _nss_nisplus_parse_etherent (result, eth, buffer, buflen);
+ {
+ enum nss_status status = niserr2nss (result->status);
+ nis_freeresult (result);
+ return status;
+ }
+ if ((parse_res = _nss_nisplus_parse_etherent (result, eth, buffer,
+ buflen)) == -1)
+ {
+ nis_freeresult (result);
+ return NSS_STATUS_TRYAGAIN;
+ }
+
if (parse_res)
return NSS_STATUS_SUCCESS;
-
- if (!parse_res && errno == ERANGE)
- return NSS_STATUS_TRYAGAIN;
- else
- return NSS_STATUS_NOTFOUND;
}
+ return NSS_STATUS_NOTFOUND;
}
+