about summary refs log tree commit diff
path: root/pwd/fgetpwent.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-06-25 10:20:09 +0000
committerRoland McGrath <roland@gnu.org>1996-06-25 10:20:09 +0000
commitc66273aae5213e7e4460631e6b823dc2bf8a79d1 (patch)
treec5aa151e2bd9b5373cd01cce47210a7cf512a31c /pwd/fgetpwent.c
parent5f0e6fc702296840d2daa39f83f6cb1e40073d58 (diff)
downloadglibc-c66273aae5213e7e4460631e6b823dc2bf8a79d1.tar.gz
glibc-c66273aae5213e7e4460631e6b823dc2bf8a79d1.tar.xz
glibc-c66273aae5213e7e4460631e6b823dc2bf8a79d1.zip
* nss/nss_files/files-parse.c (parse_list): Reset ELT for elements
	after the first!

	* nss/nsswitch.c (__nss_database_lookup): If nsswitch.conf is missing
	or doesn't mention DATABASE, use an internal default equivalent to
	"DATABASE: compat [NOTFOUND=return] dns [NOTFOUND=return] files".
	(nss_lookup_function): Call nss_new_service as needed.
	(nss_parse_file): Don't bother calling nss_new_service here.

	* grp/fgetgrent.c (LINE_PARSER): Pass zero SWALLOW arg for fields.
	* pwd/fgetpwent.c: Likewise.
Diffstat (limited to 'pwd/fgetpwent.c')
-rw-r--r--pwd/fgetpwent.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/pwd/fgetpwent.c b/pwd/fgetpwent.c
index ba9f834905..c29e96ec68 100644
--- a/pwd/fgetpwent.c
+++ b/pwd/fgetpwent.c
@@ -29,12 +29,12 @@ struct pwent_data {};
 #include "../nss/nss_files/files-parse.c"
 LINE_PARSER
 (
- STRING_FIELD (result->pw_name, ISCOLON);
- STRING_FIELD (result->pw_passwd, ISCOLON);
- INT_FIELD (result->pw_uid, ISCOLON, 10,);
- INT_FIELD (result->pw_gid, ISCOLON, 10,);
- STRING_FIELD (result->pw_gecos, ISCOLON);
- STRING_FIELD (result->pw_dir, ISCOLON);
+ STRING_FIELD (result->pw_name, ISCOLON, 0);
+ STRING_FIELD (result->pw_passwd, ISCOLON, 0);
+ INT_FIELD (result->pw_uid, ISCOLON, 0, 10,);
+ INT_FIELD (result->pw_gid, ISCOLON, 0, 10,);
+ STRING_FIELD (result->pw_gecos, ISCOLON, 0);
+ STRING_FIELD (result->pw_dir, ISCOLON, 0);
  result->pw_shell = line;
 )