glibc/nis/nis_getservlist.c
Zack Weinberg 82f43dd2d1 Include shlib-compat.h in many sunrpc/nis source files.
Every file that uses libc_hidden_nolink_sunrpc or
libnsl_hidden_nolink_def needs to include shlib-compat.h.  Currently,
most of them are getting it via stdio.h, because libio.h refers to
SHLIB_COMPAT when _LIBC is defined, so it includes shlib-compat.h.  My
experimental patch to not install libio.h breaks that chain; stdio.h
no longer pulls in libio.h even for internal users.

Accordingly, this patch adds #include <shlib-compat.h> to many files
in sunrpc/ and nis/.  There are also a small number of really obvious
fixups to includes that caught my eye while proofreading the patch -
not including headers twice in a row, not worrying about portability
to Ultrix anymore, sort of thing.

	* nis/nis_add.c, nis/nis_addmember.c, nis/nis_call.c
	* nis/nis_checkpoint.c, nis/nis_clone_dir.c, nis/nis_clone_obj.c
	* nis/nis_clone_res.c, nis/nis_creategroup.c, nis/nis_defaults.c
	* nis/nis_destroygroup.c, nis/nis_domain_of.c
	* nis/nis_domain_of_r.c, nis/nis_error.c, nis/nis_file.c
	* nis/nis_free.c, nis/nis_getservlist.c, nis/nis_ismember.c
	* nis/nis_local_names.c, nis/nis_lookup.c, nis/nis_mkdir.c
	* nis/nis_modify.c, nis/nis_ping.c, nis/nis_print.c
	* nis/nis_print_group_entry.c, nis/nis_remove.c
	* nis/nis_removemember.c, nis/nis_rmdir.c, nis/nis_server.c
	* nis/nis_subr.c, nis/nis_table.c, nis/nis_util.c
	* nis/nis_verifygroup.c, nis/nis_xdr.c, nis/yp_xdr.c
	* nis/ypclnt.c, nis/ypupdate_xdr.c, sunrpc/auth_des.c
	* sunrpc/auth_none.c, sunrpc/auth_unix.c, sunrpc/authdes_prot.c
	* sunrpc/authuxprot.c, sunrpc/clnt_gen.c, sunrpc/clnt_perr.c
	* sunrpc/clnt_raw.c, sunrpc/clnt_simp.c, sunrpc/clnt_tcp.c
	* sunrpc/clnt_udp.c, sunrpc/clnt_unix.c, sunrpc/des_crypt.c
	* sunrpc/des_soft.c, sunrpc/get_myaddr.c, sunrpc/key_call.c
	* sunrpc/key_prot.c, sunrpc/netname.c, sunrpc/pm_getmaps.c
	* sunrpc/pm_getport.c, sunrpc/pmap_clnt.c, sunrpc/pmap_prot.c
	* sunrpc/pmap_prot2.c, sunrpc/pmap_rmt.c, sunrpc/publickey.c
	* sunrpc/rpc_cmsg.c, sunrpc/rpc_dtable.c, sunrpc/rpc_prot.c
	* sunrpc/rpc_thread.c, sunrpc/rtime.c, sunrpc/svc.c
	* sunrpc/svc_auth.c, sunrpc/svc_raw.c, sunrpc/svc_run.c
	* sunrpc/svc_tcp.c, sunrpc/svc_udp.c, sunrpc/svc_unix.c
	* sunrpc/svcauth_des.c, sunrpc/xdr.c, sunrpc/xdr_array.c
	* sunrpc/xdr_float.c, sunrpc/xdr_intXX_t.c, sunrpc/xdr_mem.c
	* sunrpc/xdr_rec.c, sunrpc/xdr_ref.c, sunrpc/xdr_sizeof.c
	* sunrpc/xdr_stdio.c: Include shlib-compat.h.

	* sunrpc/des_crypt.c, sunrpc/des_soft.c: No need to include
	abi-versions.h as well as shlib-compat.h.
	* sunrpc/get_myaddr.c: Remove obsolete comment.
	* sunrpc/pmap_rmt.c: Remove obsolete comment and #undef.
	* sunrpc/rpc_thread.c: Include libc-lock.h only once.
	* resolv/res_libc.c: Include shlib-compat.h only once.
2017-06-04 11:31:28 -04:00

172 lines
4.3 KiB
C

/* Copyright (c) 1997-2017 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1997.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
#include <string.h>
#include <rpcsvc/nis.h>
#include <shlib-compat.h>
#include "nis_xdr.h"
#include "nis_intern.h"
nis_server **
nis_getservlist (const_nis_name dir)
{
nis_result *res;
nis_server **serv;
res = nis_lookup (dir, FOLLOW_LINKS);
if (res != NULL && NIS_RES_STATUS (res) == NIS_SUCCESS)
{
unsigned long i;
nis_server *server;
serv =
malloc (sizeof (nis_server *) *
(NIS_RES_OBJECT (res)->DI_data.do_servers.do_servers_len + 1));
if (__glibc_unlikely (serv == NULL))
{
nis_freeresult (res);
return NULL;
}
for (i = 0; i < NIS_RES_OBJECT (res)->DI_data.do_servers.do_servers_len;
++i)
{
server =
&NIS_RES_OBJECT (res)->DI_data.do_servers.do_servers_val[i];
serv[i] = calloc (1, sizeof (nis_server));
if (__glibc_unlikely (serv[i] == NULL))
{
free_all:
while (i-- > 0)
{
free (serv[i]->pkey.n_bytes);
if (serv[i]->ep.ep_val != NULL)
{
unsigned long int j;
for (j = 0; j < serv[i]->ep.ep_len; ++j)
{
free (serv[i]->ep.ep_val[j].proto);
free (serv[i]->ep.ep_val[j].family);
free (serv[i]->ep.ep_val[j].uaddr);
}
free (serv[i]->ep.ep_val);
}
free (serv[i]->name);
free (serv[i]);
}
free (serv);
nis_freeresult (res);
return NULL;
}
if (server->name != NULL)
{
serv[i]->name = strdup (server->name);
if (__glibc_unlikely (serv[i]->name == NULL))
{
++i;
goto free_all;
}
}
serv[i]->ep.ep_len = server->ep.ep_len;
if (serv[i]->ep.ep_len > 0)
{
unsigned long int j;
serv[i]->ep.ep_val =
malloc (server->ep.ep_len * sizeof (endpoint));
if (__glibc_unlikely (serv[i]->ep.ep_val == NULL))
{
++i;
goto free_all;
}
for (j = 0; j < serv[i]->ep.ep_len; ++j)
{
if (server->ep.ep_val[j].uaddr)
serv[i]->ep.ep_val[j].uaddr =
strdup (server->ep.ep_val[j].uaddr);
else
serv[i]->ep.ep_val[j].uaddr = NULL;
if (server->ep.ep_val[j].family)
serv[i]->ep.ep_val[j].family =
strdup (server->ep.ep_val[j].family);
else
serv[i]->ep.ep_val[j].family = NULL;
if (server->ep.ep_val[j].proto)
serv[i]->ep.ep_val[j].proto =
strdup (server->ep.ep_val[j].proto);
else
serv[i]->ep.ep_val[j].proto = NULL;
}
}
serv[i]->key_type = server->key_type;
serv[i]->pkey.n_len = server->pkey.n_len;
if (server->pkey.n_len > 0)
{
serv[i]->pkey.n_bytes = malloc (server->pkey.n_len);
if (__glibc_unlikely (serv[i]->pkey.n_bytes == NULL))
{
++i;
goto free_all;
}
memcpy (serv[i]->pkey.n_bytes, server->pkey.n_bytes,
server->pkey.n_len);
}
}
serv[i] = NULL;
}
else
{
serv = malloc (sizeof (nis_server *));
if (__glibc_unlikely (serv != NULL))
serv[0] = NULL;
}
nis_freeresult (res);
return serv;
}
libnsl_hidden_nolink_def (nis_getservlist, GLIBC_2_1)
void
nis_freeservlist (nis_server **serv)
{
int i;
if (serv == NULL)
return;
i = 0;
while (serv[i] != NULL)
{
xdr_free ((xdrproc_t)_xdr_nis_server, (char *)serv[i]);
free (serv[i]);
++i;
}
free (serv);
}
libnsl_hidden_nolink_def (nis_freeservlist, GLIBC_2_1)