===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/login/login.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -c -r1.19 -r1.20
*** src/usr.bin/login/login.c	1997/02/16 04:39:07	1.19
--- src/usr.bin/login/login.c	1997/04/19 21:01:12	1.20
***************
*** 1,4 ****
! /*	$OpenBSD: login.c,v 1.19 1997/02/16 04:39:07 downsj Exp $	*/
  /*	$NetBSD: login.c,v 1.13 1996/05/15 23:50:16 jtc Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: login.c,v 1.20 1997/04/19 21:01:12 deraadt Exp $	*/
  /*	$NetBSD: login.c,v 1.13 1996/05/15 23:50:16 jtc Exp $	*/
  
  /*-
***************
*** 44,50 ****
  #if 0
  static char sccsid[] = "@(#)login.c	8.4 (Berkeley) 4/2/94";
  #endif
! static char rcsid[] = "$OpenBSD: login.c,v 1.19 1997/02/16 04:39:07 downsj Exp $";
  #endif /* not lint */
  
  /*
--- 44,50 ----
  #if 0
  static char sccsid[] = "@(#)login.c	8.4 (Berkeley) 4/2/94";
  #endif
! static char rcsid[] = "$OpenBSD: login.c,v 1.20 1997/04/19 21:01:12 deraadt Exp $";
  #endif /* not lint */
  
  /*
***************
*** 258,264 ****
  				badlogin(tbuf);
  			failures = 0;
  		}
! 		(void)strcpy(tbuf, username);
  
  		if ((pwd = getpwnam(username)))
  			salt = pwd->pw_passwd;
--- 258,265 ----
  				badlogin(tbuf);
  			failures = 0;
  		}
! 		(void)strncpy(tbuf, username, sizeof tbuf-1);
! 		tbuf[sizeof tbuf-1] = '\0';
  
  		if ((pwd = getpwnam(username)))
  			salt = pwd->pw_passwd;
***************
*** 497,504 ****
  	(void)signal(SIGTSTP, SIG_IGN);
  
  	tbuf[0] = '-';
! 	(void)strcpy(tbuf + 1, (p = strrchr(pwd->pw_shell, '/')) ?
! 	    p + 1 : pwd->pw_shell);
  
  	if (setlogin(pwd->pw_name) < 0)
  		syslog(LOG_ERR, "setlogin() failure: %m");
--- 498,506 ----
  	(void)signal(SIGTSTP, SIG_IGN);
  
  	tbuf[0] = '-';
! 	(void)strncpy(tbuf + 1, (p = strrchr(pwd->pw_shell, '/')) ?
! 	    p + 1 : pwd->pw_shell, sizeof tbuf - 1 - 1);
! 	tbuf[sizeof tbuf - 1] = '\0';
  
  	if (setlogin(pwd->pw_name) < 0)
  		syslog(LOG_ERR, "setlogin() failure: %m");