===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/chpass/field.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- src/usr.bin/chpass/field.c	2006/03/30 21:09:58	1.8
+++ src/usr.bin/chpass/field.c	2006/03/31 00:29:13	1.9
@@ -1,4 +1,4 @@
-/*	$OpenBSD: field.c,v 1.8 2006/03/30 21:09:58 robert Exp $	*/
+/*	$OpenBSD: field.c,v 1.9 2006/03/31 00:29:13 deraadt Exp $	*/
 /*	$NetBSD: field.c,v 1.3 1995/03/26 04:55:28 glass Exp $	*/
 
 /*
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)field.c	8.4 (Berkeley) 4/2/94";
 #else
-static char rcsid[] = "$OpenBSD: field.c,v 1.8 2006/03/30 21:09:58 robert Exp $";
+static char rcsid[] = "$OpenBSD: field.c,v 1.9 2006/03/31 00:29:13 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -57,8 +57,6 @@
 int
 p_login(char *p, struct passwd *pw, ENTRY *ep)
 {
-	struct passwd *tpw;
-
 	if (!*p) {
 		warnx("empty login field");
 		return (1);
@@ -68,7 +66,7 @@
 		return (1);
 	}
 	/* XXX - what about truncated names? */
-	if (strcmp(pw->pw_name, p) != 0 && (tpw = getpwnam(p)) != NULL) {
+	if (strcmp(pw->pw_name, p) != 0 && getpwnam(p) != NULL) {
 		warnx("login %s already exists", p);
 		return (1);
 	}