===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/passwd/local_passwd.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -c -r1.40 -r1.41
*** src/usr.bin/passwd/local_passwd.c	2009/10/27 23:59:41	1.40
--- src/usr.bin/passwd/local_passwd.c	2013/01/18 11:13:38	1.41
***************
*** 1,4 ****
! /*	$OpenBSD: local_passwd.c,v 1.40 2009/10/27 23:59:41 deraadt Exp $	*/
  
  /*-
   * Copyright (c) 1990 The Regents of the University of California.
--- 1,4 ----
! /*	$OpenBSD: local_passwd.c,v 1.41 2013/01/18 11:13:38 guenther Exp $	*/
  
  /*-
   * Copyright (c) 1990 The Regents of the University of California.
***************
*** 130,137 ****
  	}
  	if (i >= 4)
  		fputc('\n', stderr);
! 	pfd = open(_PATH_MASTERPASSWD, O_RDONLY, 0);
! 	if (pfd < 0 || fcntl(pfd, F_SETFD, FD_CLOEXEC) == -1)
  		pw_error(_PATH_MASTERPASSWD, 1, 1);
  
  	/* Update master.passwd file and rebuild spwd.db. */
--- 130,137 ----
  	}
  	if (i >= 4)
  		fputc('\n', stderr);
! 	pfd = open(_PATH_MASTERPASSWD, O_RDONLY | O_CLOEXEC, 0);
! 	if (pfd < 0)
  		pw_error(_PATH_MASTERPASSWD, 1, 1);
  
  	/* Update master.passwd file and rebuild spwd.db. */