===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/ftp.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -c -r1.88 -r1.89
*** src/usr.bin/ftp/ftp.c	2014/10/24 02:01:20	1.88
--- src/usr.bin/ftp/ftp.c	2015/01/16 06:40:08	1.89
***************
*** 1,4 ****
! /*	$OpenBSD: ftp.c,v 1.88 2014/10/24 02:01:20 lteo Exp $	*/
  /*	$NetBSD: ftp.c,v 1.27 1997/08/18 10:20:23 lukem Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: ftp.c,v 1.89 2015/01/16 06:40:08 deraadt Exp $	*/
  /*	$NetBSD: ftp.c,v 1.27 1997/08/18 10:20:23 lukem Exp $	*/
  
  /*
***************
*** 112,118 ****
  hookup(char *host, char *port)
  {
  	int s, tos, error;
! 	static char hostnamebuf[MAXHOSTNAMELEN];
  	struct addrinfo hints, *res, *res0, *ares;
  	char hbuf[NI_MAXHOST];
  	char *cause = "unknown";
--- 112,118 ----
  hookup(char *host, char *port)
  {
  	int s, tos, error;
! 	static char hostnamebuf[HOST_NAME_MAX+1];
  	struct addrinfo hints, *res, *res0, *ares;
  	char hbuf[NI_MAXHOST];
  	char *cause = "unknown";
***************
*** 1755,1761 ****
  	sig_t oldintr;
  	static struct comvars {
  		int connect;
! 		char name[MAXHOSTNAMELEN];
  		union sockunion mctl;
  		union sockunion hctl;
  		FILE *in;
--- 1755,1761 ----
  	sig_t oldintr;
  	static struct comvars {
  		int connect;
! 		char name[HOST_NAME_MAX+1];
  		union sockunion mctl;
  		union sockunion hctl;
  		FILE *in;
***************
*** 1770,1777 ****
  		char nti[17];
  		char nto[17];
  		int mapflg;
! 		char mi[MAXPATHLEN];
! 		char mo[MAXPATHLEN];
  	} proxstruct, tmpstruct;
  	struct comvars *ip, *op;
  
--- 1770,1777 ----
  		char nti[17];
  		char nto[17];
  		int mapflg;
! 		char mi[PATH_MAX];
! 		char mo[PATH_MAX];
  	} proxstruct, tmpstruct;
  	struct comvars *ip, *op;
  
***************
*** 1996,2002 ****
  char *
  gunique(const char *local)
  {
! 	static char new[MAXPATHLEN];
  	char *cp = strrchr(local, '/');
  	int d, count=0;
  	char ext = '1';
--- 1996,2002 ----
  char *
  gunique(const char *local)
  {
! 	static char new[PATH_MAX];
  	char *cp = strrchr(local, '/');
  	int d, count=0;
  	char ext = '1';