===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/main.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -c -r1.96 -r1.97
*** src/usr.bin/ftp/main.c	2015/01/16 06:40:08	1.96
--- src/usr.bin/ftp/main.c	2015/02/09 08:24:21	1.97
***************
*** 1,4 ****
! /*	$OpenBSD: main.c,v 1.96 2015/01/16 06:40:08 deraadt Exp $	*/
  /*	$NetBSD: main.c,v 1.24 1997/08/18 10:20:26 lukem Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: main.c,v 1.97 2015/02/09 08:24:21 tedu Exp $	*/
  /*	$NetBSD: main.c,v 1.24 1997/08/18 10:20:26 lukem Exp $	*/
  
  /*
***************
*** 170,177 ****
  	if (strcmp(__progname, "gate-ftp") == 0)
  		gatemode = 1;
  	gateserver = getenv("FTPSERVER");
! 	if (gateserver == NULL || *gateserver == '\0')
! 		gateserver = GATE_SERVER;
  	if (gatemode) {
  		if (*gateserver == '\0') {
  			warnx(
--- 170,177 ----
  	if (strcmp(__progname, "gate-ftp") == 0)
  		gatemode = 1;
  	gateserver = getenv("FTPSERVER");
! 	if (gateserver == NULL)
! 		gateserver = "";
  	if (gatemode) {
  		if (*gateserver == '\0') {
  			warnx(