From 91eee4dd69397fa6e7b328022670d459f582b047 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 16 Jun 1998 11:43:48 +0000 Subject: Update. 1998-06-16 Thorsten Kukuk * sunrpc/svc.c: Check for NULL pointer. * nis/libnsl.map: Add public NIS+ xdr functions. * nis/rpcsvc/nis_callback.h: New file. * nis/rpcsvc/nis.h: Move xdr_* functions from here ... * nis/nis_xdr.h: ... here. * nis/nis_add.c: Use internal _xdr_* functions, check for NULL pointers, use NIS+ defines where possible. * nis/nis_cache.c: Likewise. * nis/nis_cache2_xdr.c: Likewise. * nis/nis_call.c: Likewise. * nis/nis_checkpoint.c: Likewise. * nis/nis_clone_dir.c: Likewise. * nis/nis_clone_obj.c: Likewise. * nis/nis_clone_res.c: Likewise. * nis/nis_creategroup.c: Likewise. * nis/nis_file.c: Likewise. * nis/nis_free.c: Likewise. * nis/nis_getservlist.c: Likewise. * nis/nis_local_names.c: likewise. * nis/nis_lookup.c: Likewise. * nis/nis_mkdir.c: Likewise. * nis/nis_modify.c: Likewise. * nis/nis_ping.c: Likewise. * nis/nis_print.c: Likewise. * nis/nis_remove.c: Likewise. * nis/nis_removemember.c: Likewise. * nis/nis_rmdir.c: Likewise. * nis/nis_server.c: Likewise. * nis/nis_table.c: Likewise. * nis/nis_util.c: Likewise. * nis/nis_verifygroup.c: Likewise. * nis/nis_xdr.c: Likewise. * nis/nis_callback.c: Likewise, and move xdr functions from here ... * nis/nis_xdr.c: ... to here. --- nis/nis_lookup.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'nis/nis_lookup.c') diff --git a/nis/nis_lookup.c b/nis/nis_lookup.c index cbc64c34a4..6a2198ac21 100644 --- a/nis/nis_lookup.c +++ b/nis/nis_lookup.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk , 1997. @@ -19,7 +19,7 @@ #include #include - +#include "nis_xdr.h" #include "nis_intern.h" nis_result * @@ -35,20 +35,22 @@ nis_lookup (const_nis_name name, const u_long flags) nis_name namebuf[2] = {NULL, NULL}; res = calloc (1, sizeof (nis_result)); + if (res == NULL) + return NULL; if (flags & EXPAND_NAME) { names = nis_getnames (name); if (names == NULL) { - res->status = NIS_NAMEUNREACHABLE; + NIS_RES_STATUS (res) = NIS_NAMEUNREACHABLE; return res; } } else { names = namebuf; - names[0] = (nis_name) name; + names[0] = (nis_name)name; } req.ns_name = names[0]; @@ -59,14 +61,14 @@ nis_lookup (const_nis_name name, const u_long flags) memset (res, '\0', sizeof (nis_result)); status = __do_niscall (req.ns_name, NIS_LOOKUP, - (xdrproc_t) xdr_ns_request, + (xdrproc_t) _xdr_ns_request, (caddr_t) & req, - (xdrproc_t) xdr_nis_result, + (xdrproc_t) _xdr_nis_result, (caddr_t) res, flags, NULL); if (status != NIS_SUCCESS) - res->status = status; + NIS_RES_STATUS (res) = status; - switch (res->status) + switch (NIS_RES_STATUS (res)) { case NIS_PARTIAL: case NIS_SUCCESS: @@ -77,7 +79,7 @@ nis_lookup (const_nis_name name, const u_long flags) /* if we hit the link limit, bail */ if (count_links > NIS_MAXLINKS) { - res->status = NIS_LINKNAMEERROR; + NIS_RES_STATUS (res) = NIS_LINKNAMEERROR; ++done; break; } @@ -87,6 +89,8 @@ nis_lookup (const_nis_name name, const u_long flags) req.ns_name = strdup (NIS_RES_OBJECT (res)->LI_data.li_name); nis_freeresult (res); res = calloc (1, sizeof (nis_result)); + if (res == NULL) + return NULL; } else ++done; @@ -104,7 +108,7 @@ nis_lookup (const_nis_name name, const u_long flags) if (count_links) { free (req.ns_name); - res->status = NIS_LINKNAMEERROR; + NIS_RES_STATUS (res) = NIS_LINKNAMEERROR; ++done; break; } -- cgit v1.2.3