mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-08 14:20:07 +00:00
51702635af
* locale/categories.def: Change type of _NL_CTYPE_CLASS_NAMES and _NL_CTYPE_MAP_NAMES field to stringlist. Change name of _NL_CTYPE_CODESET_NAME to "charmap". * locale/localeinfo.h (enum value_type): Add stringlist. * locale/programs/locale.c (show_info): Handle stringlist. * locale/programs/charmap.c (charmap_read): If charmap file is not using the given name try to find it by looking through all available charmap files and compare the code set name. * locale/programs/locale.c (write_charmaps): Also print names of charset in <code_set_name> fields in the files. * elf/ldd.bash.in: Correct translatable strings. * posix/TESTS: Add some more tests for character class matching. * posix/regex.c: Merge with GNU awk version. (regex_compile): Use ISO C/amend 1 functions for character class handling. * posix/regex.h: Merge with GNU awk version. * posix/getopt.c: Declare as master copies. * posix/getopt1.c: Likewise. * posix/getopt.h: Likewise. * sysdeps/unix/sysv/linux/sys/mount.h: Add definitions for option value to mount functions. Patch by a sun <asun@zoology.washington.edu>. * stdio-common/bug4.c (main): Use /tmp/bug4.test for concurrency with other tests. * sunrpc/svc_run.c (svc_exit): New, defined. (svc_run): Test for svc_stop variable. * sysdeps/m68k/s_cexp.c: Rewritten. * sysdeps/m68k/s_cexpf.c: Likewise. * sysdeps/m68k/s_cexpl.c: Likewise.
81 lines
2.8 KiB
C
81 lines
2.8 KiB
C
/* Copyright (c) 1997 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 Library General Public License as
|
|
published by the Free Software Foundation; either version 2 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
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#include <string.h>
|
|
#include <rpcsvc/nis.h>
|
|
#include <rpcsvc/nislib.h>
|
|
|
|
nis_error
|
|
nis_removemember (const_nis_name member, const_nis_name group)
|
|
{
|
|
if (group != NULL && strlen (group) > 0)
|
|
{
|
|
char buf[strlen (group) + 50];
|
|
char leafbuf[strlen (group) + 2];
|
|
char domainbuf[strlen (group) + 2];
|
|
nis_name *newmem;
|
|
nis_result *res, *res2;
|
|
nis_error status;
|
|
char *cp, *cp2;
|
|
u_int i, j;
|
|
|
|
cp = stpcpy (buf, nis_leaf_of_r (group, leafbuf, sizeof (leafbuf) - 1));
|
|
cp = stpcpy (cp, ".groups_dir");
|
|
cp2 = nis_domain_of_r (group, domainbuf, sizeof (domainbuf) - 1);
|
|
if (cp2 != NULL && strlen (cp2) > 0)
|
|
{
|
|
cp = stpcpy (cp, ".");
|
|
strcpy (cp, cp2);
|
|
}
|
|
res = nis_lookup (buf, FOLLOW_LINKS|EXPAND_NAME);
|
|
if (res->status != NIS_SUCCESS)
|
|
{
|
|
status = res->status;
|
|
nis_freeresult (res);
|
|
return status;
|
|
}
|
|
if ((res->objects.objects_len != 1) ||
|
|
(res->objects.objects_val[0].zo_data.zo_type != GROUP_OBJ))
|
|
return NIS_INVALIDOBJ;
|
|
|
|
newmem = malloc (res->objects.objects_val[0].GR_data.gr_members.gr_members_len);
|
|
|
|
j = 0;
|
|
for (i = 0; i < res->objects.objects_val[0].GR_data.gr_members.gr_members_len - 1; ++i)
|
|
{
|
|
if (strcmp (res->objects.objects_val[0].GR_data.gr_members.gr_members_val[j], member) != 0)
|
|
{
|
|
newmem[j] = res->objects.objects_val[0].GR_data.gr_members.gr_members_val[i];
|
|
++j;
|
|
}
|
|
}
|
|
--res->objects.objects_val[0].GR_data.gr_members.gr_members_len;
|
|
free (res->objects.objects_val[0].GR_data.gr_members.gr_members_val);
|
|
res->objects.objects_val[0].GR_data.gr_members.gr_members_val = newmem;
|
|
res2 = nis_modify (buf, res->objects.objects_val);
|
|
status = res2->status;
|
|
nis_freeresult (res);
|
|
nis_freeresult (res2);
|
|
|
|
return status;
|
|
}
|
|
else
|
|
return NIS_FAIL;
|
|
}
|