===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/chpass/chpass.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -c -r1.41 -r1.42
*** src/usr.bin/chpass/chpass.c	2015/01/16 06:40:06	1.41
--- src/usr.bin/chpass/chpass.c	2015/11/18 19:26:45	1.42
***************
*** 1,4 ****
! /*	$OpenBSD: chpass.c,v 1.41 2015/01/16 06:40:06 deraadt Exp $	*/
  /*	$NetBSD: chpass.c,v 1.8 1996/05/15 21:50:43 jtc Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: chpass.c,v 1.42 2015/11/18 19:26:45 tedu Exp $	*/
  /*	$NetBSD: chpass.c,v 1.8 1996/05/15 21:50:43 jtc Exp $	*/
  
  /*-
***************
*** 119,125 ****
  	if (op == EDITENTRY || op == NEWSH)
  		switch(argc) {
  		case 0:
! 			pw = getpwuid(uid);
  #ifdef	YP
  			if (pw && !force_yp)
  				use_yp = 0;
--- 119,125 ----
  	if (op == EDITENTRY || op == NEWSH)
  		switch(argc) {
  		case 0:
! 			pw = getpwuid_shadow(uid);
  #ifdef	YP
  			if (pw && !force_yp)
  				use_yp = 0;
***************
*** 130,136 ****
  				errx(1, "unknown user: uid %u", uid);
  			break;
  		case 1:
! 			pw = getpwnam(*argv);
  #ifdef	YP
  			if (pw && !force_yp)
  				use_yp = 0;
--- 130,136 ----
  				errx(1, "unknown user: uid %u", uid);
  			break;
  		case 1:
! 			pw = getpwnam_shadow(*argv);
  #ifdef	YP
  			if (pw && !force_yp)
  				use_yp = 0;
***************
*** 154,160 ****
  		pw = &lpw;
  		if (!pw_scan(arg, pw, NULL))
  			exit(1);
! 		opw = getpwnam(pw->pw_name);
  	}
  	if (opw == NULL && (opw = pw_dup(pw)) == NULL)
  		err(1, NULL);
--- 154,160 ----
  		pw = &lpw;
  		if (!pw_scan(arg, pw, NULL))
  			exit(1);
! 		opw = getpwnam_shadow(pw->pw_name);
  	}
  	if (opw == NULL && (opw = pw_dup(pw)) == NULL)
  		err(1, NULL);