Index: libc/gen/getpwent.c
===================================================================
RCS file: /home/ncvs/src/lib/libc/gen/getpwent.c,v
retrieving revision 1.57
diff -u -r1.57 getpwent.c
--- libc/gen/getpwent.c	2000/11/10 19:11:14	1.57
+++ libc/gen/getpwent.c	2000/11/13 20:39:38
@@ -213,9 +213,14 @@
 	} 
 
 	/* uid, gid */
-	__pwproto->pw_uid = pw->pw_uid;
-	__pwproto->pw_gid = pw->pw_gid;
-	__pwproto_flags |= _PWF_UID | _PWF_GID;
+	if (pw->pw_fields & _PWF_UID) {
+		__pwproto->pw_uid = pw->pw_uid;
+		__pwproto_flags |= _PWF_UID;
+	}
+	if (pw->pw_fields & _PWF_GID) {
+		__pwproto->pw_gid = pw->pw_gid;
+		__pwproto_flags |= _PWF_GID;
+	}
 
 	/* gecos */
 	if(pw->pw_gecos && (pw->pw_gecos)[0]) {