Update.cvs/libc-ud-970507

	* 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.

1 files changed, 142 insertions, 0 deletions

diff --git a/nis/nis_ismember.c b/nis/nis_ismember.c
new file mode 100644
index 0000000000..f0d087ca51
--- /dev/null
+++ b/nis/nis_ismember.c
@@ -0,0 +1,142 @@
+/* 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>
+
+/* internal_nis_ismember ()
+   return codes: -1 principal is in -group
+                  0 principal isn't in any group
+		  1 pirncipal is in group */
+static int
+internal_ismember (const_nis_name principal, 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_result *res;
+      char *cp, *cp2;
+      u_int i;
+
+      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, EXPAND_NAME|FOLLOW_LINKS);
+      if (res->status != NIS_SUCCESS && res->status != NIS_S_SUCCESS)
+        return 0;
+
+      if ((res->objects.objects_len != 1) ||
+          (res->objects.objects_val[0].zo_data.zo_type != GROUP_OBJ))
+        return 0;
+
+      /* We search twice in the list, at first, if we have the name
+	 with a "-", then if without. "-member" has priority */
+      for (i = 0;
+           i < res->objects.objects_val[0].GR_data.gr_members.gr_members_len;
+           ++i)
+	{
+	  cp =res->objects.objects_val[0].GR_data.gr_members.gr_members_val[i];
+	  if (cp[0] == '-')
+	    {
+	      if (strcmp (&cp[1], principal) == 0)
+		return -1;
+	      if (cp[1] == '@')
+		switch (internal_ismember (principal, &cp[2]))
+		  {
+		  case -1:
+		    return -1;
+		  case 1:
+		    return -1;
+		  default:
+		    break;
+		  }
+	      else
+		if (cp[1] == '*')
+		  {
+		    char buf1[strlen (principal) + 2];
+		    char buf2[strlen (cp) + 2];
+
+		    strcpy (buf1, nis_domain_of (principal));
+		    strcpy (buf2, nis_domain_of (cp));
+		    if (strcmp (buf1, buf2) == 0)
+		      return -1;
+		  }
+	    }
+	}
+      for (i = 0;
+	   i < res->objects.objects_val[0].GR_data.gr_members.gr_members_len;
+           ++i)
+	{
+	  cp =res->objects.objects_val[0].GR_data.gr_members.gr_members_val[i];
+	  if (cp[0] != '-')
+	    {
+	      if (strcmp (cp, principal) == 0)
+		return 1;
+	      if (cp[0] == '@')
+		switch (internal_ismember (principal, &cp[1]))
+		  {
+		  case -1:
+		    return -1;
+		  case 1:
+		    return 1;
+		  default:
+		    break;
+		  }
+	      else
+		if (cp[0] == '*')
+		  {
+		    char buf1[strlen (principal) + 2];
+		    char buf2[strlen (cp) + 2];
+
+		    strcpy (buf1, nis_domain_of (principal));
+		    strcpy (buf2, nis_domain_of (cp));
+		    if (strcmp (buf1, buf2) == 0)
+		      return 1;
+		  }
+	    }
+	}
+    }
+
+  return 0;
+}
+
+bool_t
+nis_ismember (const_nis_name principal, const_nis_name group)
+{
+  if (group != NULL && strlen (group) > 0)
+    {
+      int status;
+
+      status = internal_ismember (principal, group);
+      if (status == 1)
+	return TRUE;
+      else
+	return FALSE;
+    }
+  else
+    return FALSE;
+}