2 files changed, 13 insertions, 11 deletions
diff --git a/usr.bin/chpass/chpass.c b/usr.bin/chpass/chpass.c
index a15a0098b13..38e8d960b46 100644
--- a/usr.bin/chpass/chpass.c
+++ b/usr.bin/chpass/chpass.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: chpass.c,v 1.24 2002/06/27 19:16:50 millert Exp $	*/
+/*	$OpenBSD: chpass.c,v 1.25 2002/06/27 22:02:08 deraadt Exp $	*/
 /*	$NetBSD: chpass.c,v 1.8 1996/05/15 21:50:43 jtc Exp $	*/
 
 /*-
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)chpass.c	8.4 (Berkeley) 4/2/94";
 #else
-static char rcsid[] = "$OpenBSD: chpass.c,v 1.24 2002/06/27 19:16:50 millert Exp $";
+static char rcsid[] = "$OpenBSD: chpass.c,v 1.25 2002/06/27 22:02:08 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -68,17 +68,13 @@ static char rcsid[] = "$OpenBSD: chpass.c,v 1.24 2002/06/27 19:16:50 millert Exp
 #include "chpass.h"
 #include "pathnames.h"
 
-enum { NEWSH, LOADENTRY, EDITENTRY } op;
-uid_t uid;
-
 extern char *__progname;
 
+enum { NEWSH, LOADENTRY, EDITENTRY } op;
+uid_t uid;
 #ifdef	YP
-int use_yp;
-int force_yp = 0;
-extern struct passwd *ypgetpwnam(), *ypgetpwuid();
-int _yp_check(char **);
-int pw_yp(struct passwd *, uid_t);
+int	use_yp;
+int	force_yp = 0;
 #endif
 
 void	baduser(void);
diff --git a/usr.bin/chpass/chpass.h b/usr.bin/chpass/chpass.h
index 58dd95b6bf6..0be09522559 100644
--- a/usr.bin/chpass/chpass.h
+++ b/usr.bin/chpass/chpass.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: chpass.h,v 1.5 2002/02/16 21:27:44 millert Exp $	*/
+/*	$OpenBSD: chpass.h,v 1.6 2002/06/27 22:02:08 deraadt Exp $	*/
 /*	$NetBSD: chpass.h,v 1.4 1996/05/15 21:50:44 jtc Exp $	*/
 
 /*
@@ -71,3 +71,9 @@ int	 p_shell(char *, struct passwd *, ENTRY *);
 int	 p_uid(char *, struct passwd *, ENTRY *);
 char    *ttoa(char *, size_t, time_t);
 int	 verify(char *, struct passwd *);
+struct passwd
+	*ypgetpwnam(char *);
+struct passwd
+	*ypgetpwuid(uid_t uid);
+int	_yp_check(char **);
+int	pw_yp(struct passwd *, uid_t);