===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/pkill/pkill.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- src/usr.bin/pkill/pkill.c	2016/10/10 02:22:59	1.39
+++ src/usr.bin/pkill/pkill.c	2018/09/16 02:44:06	1.40
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pkill.c,v 1.39 2016/10/10 02:22:59 gsoares Exp $	*/
+/*	$OpenBSD: pkill.c,v 1.40 2018/09/16 02:44:06 millert Exp $	*/
 /*	$NetBSD: pkill.c,v 1.5 2002/10/27 11:49:34 kleink Exp $	*/
 
 /*-
@@ -544,10 +544,10 @@
 makelist(struct listhead *head, enum listtype type, char *src)
 {
 	struct list *li;
-	struct passwd *pw;
-	struct group *gr;
 	struct stat st;
 	char *sp, *p, buf[PATH_MAX];
+	uid_t uid;
+	gid_t gid;
 	int empty;
 
 	empty = 1;
@@ -588,14 +588,14 @@
 
 		switch (type) {
 		case LT_USER:
-			if ((pw = getpwnam(sp)) == NULL)
+			if (uid_from_user(sp, &uid) == -1)
 				errx(STATUS_BADUSAGE, "unknown user `%s'", sp);
-			li->li_number = pw->pw_uid;
+			li->li_number = uid;
 			break;
 		case LT_GROUP:
-			if ((gr = getgrnam(sp)) == NULL)
+			if (gid_from_group(sp, &gid) == -1)
 				errx(STATUS_BADUSAGE, "unknown group `%s'", sp);
-			li->li_number = gr->gr_gid;
+			li->li_number = gid;
 			break;
 		case LT_TTY:
 			if (strcmp(sp, "-") == 0) {