From 3353a36052a410fce07f14569e1ed4f32a3b1af5 Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Mon, 30 Dec 2002 09:45:26 +0000
Subject: Make WARNS=5 clean.

Tested on:	sparc64, Athlon[32]
---
 chpass/Makefile | 3 +--
 chpass/chpass.c | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/chpass/Makefile b/chpass/Makefile
index 5c807ee..f3f05e4 100644
--- a/chpass/Makefile
+++ b/chpass/Makefile
@@ -8,8 +8,7 @@ BINMODE=4555
 .PATH:	${.CURDIR}/../../usr.sbin/pwd_mkdb \
 	${.CURDIR}/../../lib/libc/gen
 CFLAGS+=-I${.CURDIR}/../../usr.sbin/pwd_mkdb -I${.CURDIR}/../../lib/libc/gen
-WARNS?=	4
-NO_WERROR=yes
+WARNS?=	5
 LINKS=	${BINDIR}/chpass ${BINDIR}/chfn
 LINKS+=	${BINDIR}/chpass ${BINDIR}/chsh
 LINKS+=	${BINDIR}/chpass ${BINDIR}/ypchpass
diff --git a/chpass/chpass.c b/chpass/chpass.c
index ba8baaa..54e5bc9 100644
--- a/chpass/chpass.c
+++ b/chpass/chpass.c
@@ -82,13 +82,11 @@ int master_mode;
 static void	baduser(void);
 static void	usage(void);
 
-char localhost[] = "localhost";
-
 int
 main(int argc, char *argv[])
 {
 	enum { NEWSH, LOADENTRY, EDITENTRY, NEWPW, NEWEXP } op;
-	struct passwd *pw = NULL, lpw, *old_pw;
+	struct passwd lpw, *old_pw, *pw;
 	int ch, pfd, tfd;
 	const char *password;
 	char *arg = NULL;
@@ -98,6 +96,7 @@ main(int argc, char *argv[])
 	const char *yp_domain = NULL, *yp_host = NULL;
 #endif
 
+	pw = old_pw = NULL;
 	op = EDITENTRY;
 #ifdef YP
 	while ((ch = getopt(argc, argv, "a:p:s:e:d:h:loy")) != -1)
-- 
cgit v1.2.3-56-ge451