82f43dd2d1
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.
94 lines
3 KiB
C
94 lines
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 <assert.h>
|
|
#include <string.h>
|
|
#include <rpcsvc/nis.h>
|
|
#include <shlib-compat.h>
|
|
|
|
nis_error
|
|
nis_removemember (const_nis_name member, const_nis_name group)
|
|
{
|
|
if (group != NULL && group[0] != '\0')
|
|
{
|
|
size_t grouplen = strlen (group);
|
|
char buf[grouplen + 14 + NIS_MAXNAMELEN];
|
|
char domainbuf[grouplen + 2];
|
|
nis_result *res, *res2;
|
|
nis_error status;
|
|
char *cp, *cp2;
|
|
|
|
cp = rawmemchr (nis_leaf_of_r (group, buf, sizeof (buf) - 1), '\0');
|
|
cp = stpcpy (cp, ".groups_dir");
|
|
cp2 = nis_domain_of_r (group, domainbuf, sizeof (domainbuf) - 1);
|
|
if (cp2 != NULL && cp2[0] != '\0')
|
|
{
|
|
cp = stpcpy (cp, ".");
|
|
stpcpy (cp, cp2);
|
|
}
|
|
res = nis_lookup (buf, FOLLOW_LINKS | EXPAND_NAME);
|
|
if (res == NULL)
|
|
return NIS_NOMEMORY;
|
|
if (NIS_RES_STATUS (res) != NIS_SUCCESS)
|
|
{
|
|
status = NIS_RES_STATUS (res);
|
|
nis_freeresult (res);
|
|
return status;
|
|
}
|
|
|
|
if (NIS_RES_NUMOBJ (res) != 1
|
|
|| __type_of (NIS_RES_OBJECT (res)) != NIS_GROUP_OBJ)
|
|
{
|
|
nis_freeresult (res);
|
|
return NIS_INVALIDOBJ;
|
|
}
|
|
|
|
nis_name *gr_members_val
|
|
= NIS_RES_OBJECT(res)->GR_data.gr_members.gr_members_val;
|
|
u_int gr_members_len
|
|
= NIS_RES_OBJECT(res)->GR_data.gr_members.gr_members_len;
|
|
|
|
u_int j = 0;
|
|
for (u_int i = 0; i < gr_members_len; ++i)
|
|
if (strcmp (gr_members_val[i], member) != 0)
|
|
gr_members_val[j++] = gr_members_val[i];
|
|
else
|
|
free (gr_members_val[i]);
|
|
|
|
/* There is no need to reallocate the gr_members_val array. We
|
|
just adjust the size to match the number of strings still in
|
|
it. Yes, xdr_array will use mem_free with a size parameter
|
|
but this is mapped to a simple free call which determines the
|
|
size of the block by itself. */
|
|
NIS_RES_OBJECT (res)->GR_data.gr_members.gr_members_len = j;
|
|
|
|
cp = stpcpy (buf, NIS_RES_OBJECT (res)->zo_name);
|
|
*cp++ = '.';
|
|
strncpy (cp, NIS_RES_OBJECT (res)->zo_domain, NIS_MAXNAMELEN);
|
|
res2 = nis_modify (buf, NIS_RES_OBJECT (res));
|
|
status = NIS_RES_STATUS (res2);
|
|
nis_freeresult (res);
|
|
nis_freeresult (res2);
|
|
|
|
return status;
|
|
}
|
|
else
|
|
return NIS_FAIL;
|
|
}
|
|
libnsl_hidden_nolink_def (nis_removemember, GLIBC_2_1)
|