summary refs log tree commit diff
path: root/shadow
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1996-11-10 02:21:51 +0000
committerUlrich Drepper <drepper@redhat.com>1996-11-10 02:21:51 +0000
commit2303f5fdd96d7bec2dea11b41cc0c07eddd50979 (patch)
tree9e840de64f211d9d2244f490be68f1229dfdad81 /shadow
parentfe92af183235942f1aea400ce57a173d8f3235d6 (diff)
downloadglibc-2303f5fdd96d7bec2dea11b41cc0c07eddd50979.tar.gz
glibc-2303f5fdd96d7bec2dea11b41cc0c07eddd50979.tar.xz
glibc-2303f5fdd96d7bec2dea11b41cc0c07eddd50979.zip
update from main archive 961109 cvs/libc-961110
Sun Nov 10 02:37:15 1996  Ulrich Drepper  <drepper@cygnus.com>

	* inet/gethstent_r.c: Update copyright.
	* nss/getXXbyYY_r.c: Likewise.
	* nss/nsswitch.c: Likewise.
	* nss/getXXent_r.c: Likewise.
	* nss/nss_files/files-XXX.c: Likewise.
	* nss/nss_files/files-netgroup.c: Likewise.
	* nss/nss_files/files-parse.c: Likewise.

	* nss/getXXent_r.c: Change implementation.  It's not necessary to
	call all setXXent functions.  Just find first available and
	when necessary let getXXent_r call the others.

	* nss/nss_files/files-XXX.c: Make really reentrant.  Now calls
	of getXXent and getXXbyYY can be mixed.  The cursor for traversing
	the database with getXXent will be remembered.

	* stdlib/test-canon.c (cwd): Change size to PATH_MAX.

Sat Nov  9 15:34:48 1996  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/sysv/linux/Dist: Add sys/mtio.h.
	* sysdeps/unix/sysv/linux/sys/mtio.h: New file.

	* signal/signal.h [__USE_BSD]: Add prototype for siggetmask.

Fri Nov  8 13:29:30 1996  Ulrich Drepper  <drepper@cygnus.com>

	* ctype/ctype.h (__isascii): Don't test for seventh bit not to be
	set.  Instead for none beside the first seven bits to be set.
	X/Open allows the argument to be an `int' value.
	Reported by Alain Williams <addw@phcomp.co.uk>.
	(toascii, isascii): Define macro also when __USE_XOPEN.

	* sysdeps/posix/fpathconf.c: Use fstatfs to compute NAME_MAX, not
	PATH_MAX.

Thu Nov  7 03:04:29 1996  Ulrich Drepper  <drepper@cygnus.com>

	* nss/getXXXent_r.c (SETFUNC_NAME): Reset `nip' after loop to
	NULL so that GETFUNC will see first entry.
	(ENDFUNC_NAME): Likewise.

	Rewrite Netgroups implementation to avoid global data.
	* inet/netgroup.h: Add definition of name_list and struct
	__netgrent.
	Add prototypes for internal netgroup functions.
	* nss/nss_files/files-netgroup.c (_nss_files_setnetgrent): Take
	extra argument and use the included data instead of global vars.
	(_nss_files_endnetgrent): Likewise.
	(_nss_netgroup_parseline): Change to be static and use data
	included in the RESULT structure.
	* inet/getnetgrent_r.c (startp): Move into setup function.
	(known_groups, needed_groups): new part of the __netgrent sruct.
	(freememory): Take extra argument and use included data.
	(__internal_endnetgrent): Likewise.
	(internal_setnetgrent): Renamed to __internal_setnetgrent_reuse
	and take extra argument.
	(__internal_setnetgrent): New function.  Call
	__internal_setnetgrent_reuse after calling free_memory.
	(setnetgrent): Only call __internal_setnetgrent.
	(__getnetgrent_r): Split into two functions.  __getnetgrent_r
	calls __internal_getnetgrent after locking.
	(innetgr): Use dynamic data only.  I.e., innetgr now is fully
	reentrant.

Thu Nov  7 00:15:14 1996  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/stub/setenv.c: Correct typo: unseenv -> unsetenv.
	Reported by Joshua Cowan <jcowan@jcowan.reslife.okstate.edu>.

Wed Nov  6 13:13:37 1996  Ulrich Drepper  <drepper@cygnus.com>

	* manual/creature.texi: Document that _GNU_SOURCE is no longer the
	default when no *_SOURCE macro is given.
	Reported by Karsten Weiss <karsten@addx.au.s.shuttle.de>.
	* NOTES: remade from manual/creature.texi.
	* manual/libc.texinfo: Add back line about GPL translation which
	somehow got lost.

	* Make-dist (dist.tar): Depend on README being updated.

	* rellns-sh: Correct thinko in removing leading /.
	Reported by Andreas Jaeger <aj@arthur.pfalz.de>.

	* pwd/fgetpwent_r.c: Recognize lines containing only names starting
	with `+' or `-' in parser.
	* grp/fgetgrent_r.c: Likewise.
	* shadow/sgetspent_r.c: Likewise.
	* nss/nss_files/files-spwd.c: Don't accept entries starting with
	`+' or `-'.

	* sysdeps/stub/lchown.c: New file.
Diffstat (limited to 'shadow')
-rw-r--r--shadow/sgetspent_r.c57
1 files changed, 36 insertions, 21 deletions
diff --git a/shadow/sgetspent_r.c b/shadow/sgetspent_r.c
index 5270a2a163..bba90d73a7 100644
--- a/shadow/sgetspent_r.c
+++ b/shadow/sgetspent_r.c
@@ -36,33 +36,48 @@ struct spent_data {};
 LINE_PARSER
 (,
  STRING_FIELD (result->sp_namp, ISCOLON, 0);
- STRING_FIELD (result->sp_pwdp, ISCOLON, 0);
- INT_FIELD (result->sp_lstchg, ISCOLON, 0, 10, (long int));
- INT_FIELD (result->sp_min, ISCOLON, 0, 10, (long int));
- INT_FIELD (result->sp_max, ISCOLON, 0, 10, (long int));
- while (isspace (*line))
-   ++line;
- if (*line == '\0')
+ if (line[0] == '\0'
+     && (result->sp_namp[0] == '+' || result->sp_namp[0] == '-'))
    {
-     /* The old form.  */
-     result->sp_warn = (long int) -1;
-     result->sp_inact = (long int) -1;
-     result->sp_expire = (long int) -1;
+     result->sp_pwdp = NULL;
+     result->sp_lstchg = 0;
+     result->sp_min = 0;
+     result->sp_max = 0;
+     result->sp_warn = -1l;
+     result->sp_inact = -1l;
+     result->sp_expire = -1l;
      result->sp_flag = ~0ul;
    }
  else
    {
-     INT_FIELD_MAYBE_NULL (result->sp_warn, ISCOLON, 0, 10, (long int),
-			   (long int) -1);
-     INT_FIELD_MAYBE_NULL (result->sp_inact, ISCOLON, 0, 10, (long int),
-			   (long int) -1);
-     INT_FIELD_MAYBE_NULL (result->sp_expire, ISCOLON, 0, 10, (long int),
-			   (long int) -1);
-     if (*line != '\0')
-       INT_FIELD_MAYBE_NULL (result->sp_flag, FALSE, 0, 10,
-			     (unsigned long int), ~0ul)
+     STRING_FIELD (result->sp_pwdp, ISCOLON, 0);
+     INT_FIELD (result->sp_lstchg, ISCOLON, 0, 10, (long int));
+     INT_FIELD (result->sp_min, ISCOLON, 0, 10, (long int));
+     INT_FIELD (result->sp_max, ISCOLON, 0, 10, (long int));
+     while (isspace (*line))
+       ++line;
+     if (*line == '\0')
+       {
+	 /* The old form.  */
+	 result->sp_warn = -1l;
+	 result->sp_inact = -1l;
+	 result->sp_expire = -1l;
+	 result->sp_flag = ~0ul;
+       }
      else
-       result->sp_flag = ~0ul;
+       {
+	 INT_FIELD_MAYBE_NULL (result->sp_warn, ISCOLON, 0, 10, (long int),
+			       (long int) -1);
+	 INT_FIELD_MAYBE_NULL (result->sp_inact, ISCOLON, 0, 10, (long int),
+			       (long int) -1);
+	 INT_FIELD_MAYBE_NULL (result->sp_expire, ISCOLON, 0, 10, (long int),
+			       (long int) -1);
+	 if (*line != '\0')
+	   INT_FIELD_MAYBE_NULL (result->sp_flag, FALSE, 0, 10,
+				 (unsigned long int), ~0ul)
+	 else
+	   result->sp_flag = ~0ul;
+       }
    }
  )