===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/chpass/chpass.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -c -r1.27 -r1.28
*** src/usr.bin/chpass/chpass.c	2003/06/03 02:56:06	1.27
--- src/usr.bin/chpass/chpass.c	2003/07/01 01:01:28	1.28
***************
*** 1,4 ****
! /*	$OpenBSD: chpass.c,v 1.27 2003/06/03 02:56:06 millert Exp $	*/
  /*	$NetBSD: chpass.c,v 1.8 1996/05/15 21:50:43 jtc Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: chpass.c,v 1.28 2003/07/01 01:01:28 avsm Exp $	*/
  /*	$NetBSD: chpass.c,v 1.8 1996/05/15 21:50:43 jtc Exp $	*/
  
  /*-
***************
*** 40,46 ****
  #if 0
  static char sccsid[] = "@(#)chpass.c	8.4 (Berkeley) 4/2/94";
  #else
! static char rcsid[] = "$OpenBSD: chpass.c,v 1.27 2003/06/03 02:56:06 millert Exp $";
  #endif
  #endif /* not lint */
  
--- 40,46 ----
  #if 0
  static char sccsid[] = "@(#)chpass.c	8.4 (Berkeley) 4/2/94";
  #else
! static char rcsid[] = "$OpenBSD: chpass.c,v 1.28 2003/07/01 01:01:28 avsm Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 53,58 ****
--- 53,59 ----
  #include <err.h>
  #include <errno.h>
  #include <fcntl.h>
+ #include <paths.h>
  #include <pwd.h>
  #include <signal.h>
  #include <stdio.h>
***************
*** 62,68 ****
  #include <util.h>
  
  #include "chpass.h"
- #include "pathnames.h"
  
  extern char *__progname;
  
--- 63,68 ----
***************
*** 173,179 ****
  
  	/* Edit the user passwd information if requested. */
  	if (op == EDITENTRY) {
! 		char tempname[] = __CONCAT(_PATH_VARTMP,"pw.XXXXXXXX");
  		int edit_status;
  
  		dfd = mkstemp(tempname);
--- 173,179 ----
  
  	/* Edit the user passwd information if requested. */
  	if (op == EDITENTRY) {
! 		char tempname[] = __CONCAT(_PATH_VARTMP,"pw.XXXXXXXXXX");
  		int edit_status;
  
  		dfd = mkstemp(tempname);