mirror of
				https://sourceware.org/git/glibc.git
				synced 2025-10-30 10:45:40 +03:00 
			
		
		
		
	1997-12-08 03:24 Ulrich Drepper <drepper@cygnus.com> * Makeconfig: Define $(rt) to rt if linuxthreads is available. * Makefile (subdirs): Replace rt by $(rt). * shlib-versions: Use version .2 for NSS modules. * grp/fgetgrent_r.c (LINE_PARSER): Call parse_line with extra argument. * pwd/fgetpwent_r.c: Likewise. * spwd/fgetspent_r.c: Likewise. * spwd/sgetspent_r.c: Likewise. * hesiod/nss_hesiod/hesiod-grp.c (lookup): Add new argument. Store error number in *ERRNOP. Little optimization. * hesiod/nss_hesiod/hesiod-pwd.c: Likewise. * hesiod/nss_hesiod/hesiod-service.c: Likewise. * inet/getnetgrent_r.c (__internal_setnetgrent_reuse): Likewise. (__internal_getnetgrent_r): New argument. Call __internal_setnetgrent_reuse with new argument. (__getnetgrent_r): Call __internal_getnetgrent_r with new argument. * inet/netgroup.h: Add argument to prototypes. * nis/nisplus-parser.h: Likewise. * nis/nss_compat/compat-grp.c: Change everything to store error code through provided pointer and not use errno. * nis/nss_compat/compat-pwd.c: Likewise. * nis/nss_compat/compat-spwd.c: Likewise. * nis/nss_nis/nis-alias.c: Likewise. * nis/nss_nis/nis-ethers.c: Likewise. * nis/nss_nis/nis-grp.c: Likewise. * nis/nss_nis/nis-hosts.c: Likewise. * nis/nss_nis/nis-netgrp.c: Likewise. * nis/nss_nis/nis-network.c: Likewise. * nis/nss_nis/nis-proto.c: Likewise. * nis/nss_nis/nis-publickey.c: Likewise. * nis/nss_nis/nis-pwd.c: Likewise. * nis/nss_nis/nis-rpc.c: Likewise. * nis/nss_nis/nis-service.c: Likewise. * nis/nss_nis/nis-spwd.c: Likewise. * nis/nss_nisplus/nisplus-alias.c: Likewise. * nis/nss_nisplus/nisplus-ethers.c: Likewise. * nis/nss_nisplus/nisplus-grp.c: Likewise. * nis/nss_nisplus/nisplus-hosts.c: Likewise. * nis/nss_nisplus/nisplus-netgrp.c: Likewise. * nis/nss_nisplus/nisplus-network.c: Likewise. * nis/nss_nisplus/nisplus-parser.c: Likewise. * nis/nss_nisplus/nisplus-proto.c: Likewise. * nis/nss_nisplus/nisplus-publickey.c: Likewise. * nis/nss_nisplus/nisplus-pwd.c: Likewise. * nis/nss_nisplus/nisplus-rpc.c: Likewise. * nis/nss_nisplus/nisplus-service.c: Likewise. * nis/nss_nisplus/nisplus-spwd.c: Likewise. * nss/nss_db/db-XXX.c: Likewise. * nss/nss_db/db-alias.c: Likewise. * nss/nss_db/db-netgrp.c: Likewise. * nss/nss_files/files-XXX.c: Likewise * nss/nss_files/files-alias.c: Likewise * nss/nss_files/files-netgrp.c: Likewise * nss/nss_files/files-parse.c: Likewise * nss/getXXbyYY_r.c: Call with __errno_location() as value for new parameter of get functions. * nss/getXXent_r.c: Likewise. * localedata/tst-fmon.c: Print debug info if test fails. * rt/Makefile (routines): Add aio_notify. * rt/aio.h: Remove non-public definitions. Add aioinit stuff. * rt/aio_cancel.c: Rewrite to support lio_listio and aio_suspend. * rt/aio_fsync.c: Likewise. * rt/aio_misc.c: Likewise. * rt/aio_misc.h: Likewise. * rt/aio_read.c: Likewise. * rt/aio_read64.c: Likewise. * rt/aio_suspend.c: Likewise. * rt/aio_write.c: Likewise. * rt/aio_write64.c: Likewise. * rt/lio_listio.c: Likewise. * rt/lio_listio64.c: Likewise. * rt/aio_notify.c: New file. * sysdeps/generic/bits/sigset.h: Pretty print. * sysdeps/posix/pwrite.c: Define weak alias only if function is really defined as __pwrite. * sysdeps/unix/sysv/linux/pread.c: Rewrite to use syscall directly instead of pread64. * sysdeps/unix/sysv/linux/pwrite.c: Likewise. * sysdeps/unix/sysv/linux/Makefile [$(subdir)=signal] (sysdep_routines): Add rt_sigpending and rt_sigreturn. * sysdeps/unix/sysv/linux/sigaction.c: Use correct value for sigset_t size in syscall. * sysdeps/unix/sysv/linux/sigpending.c: Likewise. * sysdeps/unix/sysv/linux/sigprocmask.c: Likewise. * sysdeps/unix/sysv/linux/sigreturn.c: Likewise. * sysdeps/unix/sysv/linux/sigsuspend.c: Likewise. * sysdeps/unix/sysv/linux/sigtimedwait.c: Likewise. * sysdeps/unix/sysv/linux/sigwaitinfo.c: Likewise. * sysdeps/unix/sysv/linux/i386/sigaction.c: Likewise. Take care for ACT being NULL. * sysdeps/unix/sysv/linux/syscalls.list: Don't mention user for RT signals. * sysdeps/unix/sysv/linux/i386/s_pread64.s: Return ENOSYS if __NR_pread is not defined. * sysdeps/unix/sysv/linux/i386/s_pwrite64.s: Return ENOSYS if __NR_pwrite is not defined. 1997-12-07 11:15 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis/nss_compat/compat-grp.c: If buffer is to small, set the file handle for /etc/group back in some more cases. * nis/nss_compat/compat-pwd.c: If buffer is to small, set the file handle for /etc/passwd back in some more cases. * nis/nss_compat/compat-spwd.c: If buffer is to small, set the file handle for /etc/shadow back in some more cases. 1997-12-06 17:00 H.J. Lu <hjl@gnu.org> * sysdeps/posix/sigblock.c (__sigblock): Don't check int mask beyound its size. * sysdeps/posix/sigsetmask.c (__sigsetmask): Ditto. * sysdeps/posix/sigvec.c (convert_mask, __sigvec): Ditto. 1997-12-06 04:38 Ulrich Drepper <drepper@cygnus.com> * sysdeps/wordsize-32/inttypes.h: Rewrite {str,wcs}to{i,u}max handling. Don't use macros, we need functions. Use inline functions for optimization. * sysdeps/wordsize-64/inttypes.h: Likewise. * sysdeps/wordsize-32/Makefile: Add strtoimax, stroumax, wcstoimax, and wcstoumax. * sysdeps/wordsize-64/Makefile: Likewise. * sysdeps/wordsize-32/Dist: Likewise. * sysdeps/wordsize-64/Dist: Likewise. * sysdeps/wordsize-32/strtoimax.c: New file. * sysdeps/wordsize-32/strtoumax.c: New file. * sysdeps/wordsize-32/wcstoimax.c: New file. * sysdeps/wordsize-32/wcstoumax.c: New file. * sysdeps/wordsize-64/strtoimax.c: New file. * sysdeps/wordsize-64/strtoumax.c: New file. * sysdeps/wordsize-64/wcstoimax.c: New file. * sysdeps/wordsize-64/wcstoumax.c: New file. 1997-12-04 10:40 Philip Blundell <pb@nexus.co.uk> * sysdeps/generic/wait3.c (__wait3): Use ANSI-style definition so that transparent union works. * sysdeps/generic/wait4.c (__wait4): Likewise. * sysdeps/generic/wait.c (__wait): Likewise. * sysdeps/generic/getpeername.c (getpeername): Use socklen_t not size_t. * sysdeps/generic/syscall.c (syscall): Return value and arg are long, to match prototype. * malloc/malloc.c (HAVE_MREMAP): Set to 0 for ARM, as we don't have mremap() yet. * sysdeps/generic/usleep.c (usleep): Returns void, to match prototype. * sysdeps/unix/sysv/linux/arm/syscalls.list: New file. * sysdeps/generic/bits/time.h: Use __time_t not time_t. * sysdeps/generic/bits/resource.h: Include <bits/types.h> for __rlim_t. * sysdeps/standalone/arm/bits/errno.h (ENOTTY): Added. * sysdeps/generic/bits/dirent.h (struct dirent64): Added. * io/sys/stat.h (S_ISLNK): Always false if we don't have __S_IFLNK. * sysdeps/standalone/close.c (_STDIO_H): Define before including <bits/stdio_lim.h>. * sysdeps/standalone/filedesc.h (_STDIO_H): Likewise. 1997-12-06 01:09 Ulrich Drepper <drepper@cygnus.com> * posix/sys/wait.h: Don't use transparent unions in C++. 1997-12-05 Andreas Jaeger <aj@arthur.rhein-neckar.de> * time/time.h: Add strfxtime. * libc.map: Add tcgetsid, strcasestr, wmemrtombs, wmemrtowcs, sysv_signal, strfxtime, pread64, pwrite64. 1997-11-30 21:57 Richard Henderson <rth@cygnus.com> Alpha changes for EGCS: * config.h.in (ASM_ALPHA_NG_SYMBOL_PREFIX): New entry. * configure.in (libc_cv_gcc_alpha_ng_prefix): New check. * sysdeps/alpha/dl-machine.h (_dl_runtime_resolve): Care for prefix. (_start): Likewise. * sysdeps/unix/sysv/linux/alpha/init-first.h: Likewise.
		
			
				
	
	
		
			271 lines
		
	
	
		
			6.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			271 lines
		
	
	
		
			6.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /* Netgroup file parser in nss_files modules.
 | |
|    Copyright (C) 1996, 1997 Free Software Foundation, Inc.
 | |
|    This file is part of the GNU C Library.
 | |
|    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 | |
| 
 | |
|    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 <ctype.h>
 | |
| #include <errno.h>
 | |
| #include <netdb.h>
 | |
| #include <stdio.h>
 | |
| #include <stdlib.h>
 | |
| #include <string.h>
 | |
| #include "nsswitch.h"
 | |
| #include "netgroup.h"
 | |
| 
 | |
| #define DATAFILE	"/etc/netgroup"
 | |
| 
 | |
| 
 | |
| #define EXPAND(needed)							      \
 | |
|   do									      \
 | |
|     {									      \
 | |
|       size_t old_cursor = result->cursor - result->data;		      \
 | |
| 									      \
 | |
|       result->data_size += 512 > 2 * needed ? 512 : 2 * needed;		      \
 | |
|       result->data = realloc (result->data, result->data_size);		      \
 | |
| 									      \
 | |
|       if (result->data == NULL)						      \
 | |
| 	{								      \
 | |
| 	  status = NSS_STATUS_UNAVAIL;					      \
 | |
| 	  goto the_end;							      \
 | |
| 	}								      \
 | |
|       									      \
 | |
|       result->cursor = result->data + old_cursor;			      \
 | |
|     }									      \
 | |
|   while (0)
 | |
| 
 | |
| 
 | |
| enum nss_status
 | |
| _nss_files_setnetgrent (const char *group, struct __netgrent *result)
 | |
| {
 | |
|   FILE *fp;
 | |
|   enum nss_status status;
 | |
| 
 | |
|   if (group[0] == '\0')
 | |
|     return NSS_STATUS_UNAVAIL;
 | |
| 
 | |
|   /* Find the netgroups file and open it.  */
 | |
|   fp = fopen (DATAFILE, "r");
 | |
|   if (fp == NULL)
 | |
|     status = errno == EAGAIN ? NSS_STATUS_TRYAGAIN : NSS_STATUS_UNAVAIL;
 | |
|   else
 | |
|     {
 | |
|       /* Read the file line by line and try to find the description
 | |
| 	 GROUP.  We must take care for long lines.  */
 | |
|       char *line = NULL;
 | |
|       size_t line_len = 0;
 | |
|       const ssize_t group_len = strlen (group);
 | |
| 
 | |
|       status = NSS_STATUS_NOTFOUND;
 | |
|       result->cursor = result->data;
 | |
| 
 | |
|       while (!feof (fp))
 | |
| 	{
 | |
| 	  ssize_t curlen = getline (&line, &line_len, fp);
 | |
| 	  int found;
 | |
| 
 | |
| 	  if (curlen < 0)
 | |
| 	    {
 | |
| 	      status = NSS_STATUS_NOTFOUND;
 | |
| 	      break;
 | |
| 	    }
 | |
| 
 | |
| 	  found = (curlen > group_len && strncmp (line, group, group_len) == 0
 | |
| 		   && isspace (line[group_len]));
 | |
| 
 | |
| 	  /* Read the whole line (including continuation) and store it
 | |
| 	     if FOUND in nonzero.  Otherwise we don't need it.  */
 | |
| 	  if (found)
 | |
| 	    {
 | |
| 	      /* Store the data from the first line.  */
 | |
| 	      EXPAND (curlen - group_len);
 | |
| 	      memcpy (result->cursor, &line[group_len + 1],
 | |
| 		      curlen - group_len);
 | |
| 	      result->cursor += (curlen - group_len) - 1;
 | |
| 	    }
 | |
| 
 | |
| 	  while (line[curlen - 1] == '\n' && line[curlen - 2] == '\\')
 | |
| 	    {
 | |
| 	      /* Yes, we have a continuation line.  */
 | |
| 	      if (found)
 | |
| 		/* Remove these characters from the stored line.  */
 | |
| 		result->cursor -= 2;
 | |
| 
 | |
| 	      /* Get next line.  */
 | |
| 	      curlen = getline (&line, &line_len, fp);
 | |
| 	      if (curlen <= 0)
 | |
| 		break;
 | |
| 
 | |
| 	      if (found)
 | |
| 		{
 | |
| 		  /* Make sure we have enough room.  */
 | |
| 		  EXPAND (1 + curlen + 1);
 | |
| 
 | |
| 		  /* Add separator in case next line starts immediately.  */
 | |
| 		  *result->cursor++ = ' ';
 | |
| 
 | |
| 		  /* Copy new line.  */
 | |
| 		  memcpy (result->cursor, line, curlen + 1);
 | |
| 		  result->cursor += curlen;
 | |
| 		}
 | |
| 	    }
 | |
| 
 | |
| 	  if (found)
 | |
| 	    {
 | |
| 	      /* Now we have read the line.  */
 | |
| 	      status = NSS_STATUS_SUCCESS;
 | |
| 	      result->cursor = result->data;
 | |
| 	      result->first = 1;
 | |
| 	      break;
 | |
| 	    }
 | |
| 	}
 | |
| 
 | |
|     the_end:
 | |
|       /* We don't need the file and the line buffer anymore.  */
 | |
|       free (line);
 | |
|       fclose (fp);
 | |
|     }
 | |
| 
 | |
|   return status;
 | |
| }
 | |
| 
 | |
| 
 | |
| int
 | |
| _nss_files_endnetgrent (struct __netgrent *result)
 | |
| {
 | |
|   /* Free allocated memory for data if some is present.  */
 | |
|   if (result->data != NULL)
 | |
|     {
 | |
|       free (result->data);
 | |
|       result->data = NULL;
 | |
|       result->data_size = 0;
 | |
|       result->cursor = NULL;
 | |
|     }
 | |
| 
 | |
|   return NSS_STATUS_SUCCESS;
 | |
| }
 | |
| 
 | |
| 
 | |
| enum nss_status
 | |
| _nss_netgroup_parseline (char **cursor, struct __netgrent *result,
 | |
| 			 char *buffer, size_t buflen, int *errnop)
 | |
| {
 | |
|   enum nss_status status;
 | |
|   const char *host, *user, *domain;
 | |
|   char *cp = *cursor;
 | |
| 
 | |
|   /* Some sanity checks.  */
 | |
|   if (cp == NULL)
 | |
|     return NSS_STATUS_NOTFOUND;
 | |
| 
 | |
|   /* First skip leading spaces.  */
 | |
|   while (isspace (*cp))
 | |
|     ++cp;
 | |
| 
 | |
|   if (*cp != '(')
 | |
|     {
 | |
|       /* We have a list of other netgroups.  */
 | |
|       char *name = cp;
 | |
| 
 | |
|       while (*cp != '\0' && ! isspace (*cp))
 | |
| 	++cp;
 | |
| 
 | |
|       if (name != cp)
 | |
| 	{
 | |
| 	  /* It is another netgroup name.  */
 | |
| 	  int last = *cp == '\0';
 | |
| 
 | |
| 	  result->type = group_val;
 | |
| 	  result->val.group = name;
 | |
| 	  *cp = '\0';
 | |
| 	  if (! last)
 | |
| 	    ++cp;
 | |
| 	  *cursor = cp;
 | |
| 	  result->first = 0;
 | |
| 
 | |
| 	  return NSS_STATUS_SUCCESS;
 | |
| 	}
 | |
| 
 | |
|       return result->first ? NSS_STATUS_NOTFOUND : NSS_STATUS_RETURN;
 | |
|     }
 | |
| 
 | |
|   /* Match host name.  */
 | |
|   host = ++cp;
 | |
|   while (*cp != ',')
 | |
|     if (*cp++ == '\0')
 | |
|       return result->first ? NSS_STATUS_NOTFOUND : NSS_STATUS_RETURN;
 | |
| 
 | |
|   /* Match user name.  */
 | |
|   user = ++cp;
 | |
|   while (*cp != ',')
 | |
|     if (*cp++ == '\0')
 | |
|       return result->first ? NSS_STATUS_NOTFOUND : NSS_STATUS_RETURN;
 | |
| 
 | |
|   /* Match domain name.  */
 | |
|   domain = ++cp;
 | |
|   while (*cp != ')')
 | |
|     if (*cp++ == '\0')
 | |
|       return result->first ? NSS_STATUS_NOTFOUND : NSS_STATUS_RETURN;
 | |
|   ++cp;
 | |
| 
 | |
| 
 | |
|   /* When we got here we have found an entry.  Before we can copy it
 | |
|      to the private buffer we have to make sure it is big enough.  */
 | |
|   if (cp - host > buflen)
 | |
|     {
 | |
|       *errnop = ERANGE;
 | |
|       status = NSS_STATUS_UNAVAIL;
 | |
|     }
 | |
|   else
 | |
|     {
 | |
|       memcpy (buffer, host, cp - host);
 | |
|       result->type = triple_val;
 | |
| 
 | |
|       buffer[(user - host) - 1] = '\0';
 | |
|       result->val.triple.host = *host == ',' ? NULL : buffer;
 | |
| 
 | |
|       buffer[(domain - host) - 1] = '\0';
 | |
|       result->val.triple.user = *user == ',' ? NULL : buffer + (user - host);
 | |
| 
 | |
|       buffer[(cp - host) - 1] = '\0';
 | |
|       result->val.triple.domain =
 | |
| 	*domain == ')' ? NULL : buffer + (domain - host);
 | |
| 
 | |
|       status = NSS_STATUS_SUCCESS;
 | |
| 
 | |
|       /* Remember where we stopped reading.  */
 | |
|       *cursor = cp;
 | |
| 
 | |
|       result->first = 0;
 | |
|     }
 | |
| 
 | |
|   return status;
 | |
| }
 | |
| 
 | |
| 
 | |
| enum nss_status
 | |
| _nss_files_getnetgrent_r (struct __netgrent *result, char *buffer,
 | |
| 			  size_t buflen, int *errnop)
 | |
| {
 | |
|   enum nss_status status;
 | |
| 
 | |
|   status = _nss_netgroup_parseline (&result->cursor, result, buffer, buflen,
 | |
| 				    errnop);
 | |
| 
 | |
|   return status;
 | |
| }
 |