===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/ruserpass.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -c -r1.21 -r1.22
*** src/usr.bin/ftp/ruserpass.c	2007/03/22 11:35:02	1.21
--- src/usr.bin/ftp/ruserpass.c	2007/03/22 15:25:17	1.22
***************
*** 1,4 ****
! /*	$OpenBSD: ruserpass.c,v 1.21 2007/03/22 11:35:02 moritz Exp $	*/
  /*	$NetBSD: ruserpass.c,v 1.14 1997/07/20 09:46:01 lukem Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: ruserpass.c,v 1.22 2007/03/22 15:25:17 moritz Exp $	*/
  /*	$NetBSD: ruserpass.c,v 1.14 1997/07/20 09:46:01 lukem Exp $	*/
  
  /*
***************
*** 35,41 ****
  static char sccsid[] = "@(#)ruserpass.c	8.4 (Berkeley) 4/27/95";
  #else
  #ifndef SMALL
! static const char rcsid[] = "$OpenBSD: ruserpass.c,v 1.21 2007/03/22 11:35:02 moritz Exp $";
  #endif /* SMALL */
  #endif
  #endif /* not lint */
--- 35,41 ----
  static char sccsid[] = "@(#)ruserpass.c	8.4 (Berkeley) 4/27/95";
  #else
  #ifndef SMALL
! static const char rcsid[] = "$OpenBSD: ruserpass.c,v 1.22 2007/03/22 15:25:17 moritz Exp $";
  #endif /* SMALL */
  #endif
  #endif /* not lint */
***************
*** 91,99 ****
  	hdir = getenv("HOME");
  	if (hdir == NULL || *hdir == '\0')
  		return (0);
! 	if (strlen(hdir) + sizeof(".netrc") < sizeof(buf)) {
! 		(void)snprintf(buf, sizeof buf, "%s/.netrc", hdir);
! 	} else {
  		warnx("%s/.netrc: %s", hdir, strerror(ENAMETOOLONG));
  		return (0);
  	}
--- 91,98 ----
  	hdir = getenv("HOME");
  	if (hdir == NULL || *hdir == '\0')
  		return (0);
! 	i = snprintf(buf, sizeof(buf), "%s/.netrc", hdir);
! 	if (i < 0 || i >= sizeof(buf)) {
  		warnx("%s/.netrc: %s", hdir, strerror(ENAMETOOLONG));
  		return (0);
  	}