===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/chpass/edit.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -c -r1.31 -r1.32
*** src/usr.bin/chpass/edit.c	2007/11/17 16:47:21	1.31
--- src/usr.bin/chpass/edit.c	2009/03/05 20:53:13	1.32
***************
*** 1,4 ****
! /*	$OpenBSD: edit.c,v 1.31 2007/11/17 16:47:21 millert Exp $	*/
  /*	$NetBSD: edit.c,v 1.6 1996/05/15 21:50:45 jtc Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: edit.c,v 1.32 2009/03/05 20:53:13 millert Exp $	*/
  /*	$NetBSD: edit.c,v 1.6 1996/05/15 21:50:45 jtc Exp $	*/
  
  /*-
***************
*** 34,40 ****
  #if 0
  static char sccsid[] = "@(#)edit.c	8.3 (Berkeley) 4/2/94";
  #else
! static char rcsid[] = "$OpenBSD: edit.c,v 1.31 2007/11/17 16:47:21 millert Exp $";
  #endif
  #endif /* not lint */
  
--- 34,40 ----
  #if 0
  static char sccsid[] = "@(#)edit.c	8.3 (Berkeley) 4/2/94";
  #else
! static char rcsid[] = "$OpenBSD: edit.c,v 1.32 2009/03/05 20:53:13 millert Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 110,116 ****
  		    *pw->pw_shell ? pw->pw_shell : _PATH_BSHELL);
  	}
  	/* Only admin can change "restricted" shells. */
! 	else if (ok_shell(pw->pw_shell))
  		/*
  		 * Make shell a restricted field.  Ugly with a
  		 * necklace, but there's not much else to do.
--- 110,116 ----
  		    *pw->pw_shell ? pw->pw_shell : _PATH_BSHELL);
  	}
  	/* Only admin can change "restricted" shells. */
! 	else if (ok_shell(pw->pw_shell, NULL))
  		/*
  		 * Make shell a restricted field.  Ugly with a
  		 * necklace, but there's not much else to do.