upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-03-03 05:41:01 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Separate the pftp and FTP_PASSIVE_MODE tests so gate mode works again.

Browse source 
PR:		bin/12070
Submitted by:	Dominic Mitchell <Dom.Mitchell@palmerharvey.co.uk>

Specifically check that FTP_PASSIVE_MODE is set to YES, rather than
just checking if it is defined.

Discussed on:	freebsd-current
This commit is contained in:
Dag-Erling Smørgrav 1999-06-07 16:35:15 +00:00
parent 141894af60
commit ff7b59cd9e
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
usr.bin/ftp/main.c
View file

@ -1,4 +1,4 @@
/* $Id$ */
/* $Id: main.c,v 1.16 1997/12/13 20:38:19 pst Exp $ */
/* $NetBSD: main.c,v 1.26 1997/10/14 16:31:22 christos Exp $ */
/*
@ -44,7 +44,7 @@ __COPYRIGHT("@(#) Copyright (c) 1985, 1989, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 10/9/94";
#else
__RCSID("$Id$");
__RCSID("$Id: main.c,v 1.16 1997/12/13 20:38:19 pst Exp $");
__RCSID_SOURCE("$NetBSD: main.c,v 1.26 1997/10/14 16:31:22 christos Exp $");
#endif
#endif /* not lint */
@ -78,7 +78,7 @@ main(argc, argv)
int ch, top, rval;
long port;
struct passwd *pw = NULL;
char *cp, *ep, homedir[MAXPATHLEN];
char *cp, *ep, homedir[MAXPATHLEN], *s;
int dumbterm;
(void) setlocale(LC_ALL, "");
@ -131,7 +131,10 @@ main(argc, argv)
cp = strrchr(argv[0], '/');
cp = (cp == NULL) ? argv[0] : cp + 1;
if (getenv("FTP_PASSIVE_MODE") || strcmp(cp, "pftp") == 0)
if ((s = getenv("FTP_PASSIVE_MODE")) != NULL
&& strcasecmp(s, "yes") == 0)
passivemode = 1;
if (strcmp(cp, "pftp") == 0)
passivemode = 1;
else if (strcmp(cp, "gate-ftp") == 0)
gatemode = 1;