Attachment #29075 for bug #47507

View | Details | Raw Unified | Return to bug 47507
Collapse All | Expand All

Lines 1-3 Link Here

(-)netkit-ftp-old/ChangeLog (+3 lines)
		1	28-Nov-2000:
		2	IPv6 support. (Hiroyuki YAMAMORI <h-yamamo@db3.so-net.ne.jp>)
		3
1	8-Jul-2000:	4	8-Jul-2000:
2	Fix misused printf-function call (not %n-exploitable though).	5	Fix misused printf-function call (not %n-exploitable though).
3		6

Lines 24-29 Link Here

(-)netkit-ftp-old/configure (+42 lines)
24	--binmode=mode Mode for binaries [755]	24	--binmode=mode Mode for binaries [755]
25	--manmode=mode Mode for manual pages [644]	25	--manmode=mode Mode for manual pages [644]
26	--with-c-compiler=cc Program for compiling C source [guessed]	26	--with-c-compiler=cc Program for compiling C source [guessed]
		27	--enable-ipv6 Enable IPv6 support
27	EOF	28	EOF
28	exit 0;;	29	exit 0;;
29	--verbose) ;;	30	--verbose) ;;
Lines 39-44 Link Here
39	--manmode=) MANMODE=`echo $1 \| sed 's/^[^=]=//'` ;;	40	--manmode=) MANMODE=`echo $1 \| sed 's/^[^=]=//'` ;;
40	--with-c-compiler=) CC=`echo $1 \| sed 's/^[^=]=//'` ;;	41	--with-c-compiler=) CC=`echo $1 \| sed 's/^[^=]=//'` ;;
41	--without-readline\|--disable-readline) WITHOUT_READLINE=1;;	42	--without-readline\|--disable-readline) WITHOUT_READLINE=1;;
		43
		44	--disable-ipv6) ENABLE_IPV6=no;;
		45	--enable-ipv6=) ENABLE_IPV6=`echo $1 \| sed 's/^[^=]=//'`;;
		46	--enable-ipv6) ENABLE_IPV6=yes;;
		47
42	*) echo "Unrecognized option: $1"; exit 1;;	48	*) echo "Unrecognized option: $1"; exit 1;;
43	esac	49	esac
44	shift	50	shift
Lines 146-151 Link Here
146	rm -f __conftest*	152	rm -f __conftest*
147		153
148	##################################################	154	##################################################
		155	## Enable IPv6
		156	echo -n "Whether to enable IPv6 support... "
		157	if [ x"$ENABLE_IPV6" = x"yes" ]; then
		158	echo yes
		159	CFLAGS="$CFLAGS -DINET6"
		160	else
		161	echo no
		162	fi
		163
		164	rm -f __conftest*
		165
		166	## Search IPv6 Library / Headers
		167	if [ x"$ENABLE_IPV6" = x"yes" ]; then
		168	echo -n "Search for IPv6 library... "
		169	inet6libdirs="/usr/local/v6/lib /usr/local/lib /usr /usr/inet6/lib"
		170	inet6libs="inet6"
		171	inet6found=no
		172	for inet6libdir in $inet6libdirs; do
		173	for inet6lib in $inet6libs; do
		174	if [ -d $inet6libdir ] && [ -f $inet6libdir/lib$inet6lib.a ]; then
		175	inet6found=yes
		176	break 2
		177	fi
		178	done
		179	done
		180	if [ x"$inet6found" = x"yes" ]; then
		181	echo "$inet6libdir/lib$inet6lib.a"
		182	LIBS="$LIBS -L$inet6libdir -l$inet6lib"
		183	else
		184	echo "not found"
		185	fi
		186	fi
		187
		188	rm -f __conftest*
		189
		190	##################################################
149		191
150	echo -n 'Checking for BSD signal semantics... '	192	echo -n 'Checking for BSD signal semantics... '
151	cat <<EOF >__conftest.c	193	cat <<EOF >__conftest.c




cmds.o glob.o: glob.h

install: ftp
	install -d $(INSTALLROOT)$(BINDIR)
	install -s -m$(BINMODE) ftp $(INSTALLROOT)$(BINDIR)
	ln -sf ftp $(INSTALLROOT)$(BINDIR)/pftp
	install -d $(INSTALLROOT)$(MANDIR)/man1
	install -m$(MANMODE) ftp.1 $(INSTALLROOT)$(MANDIR)/man1
	ln -sf ftp.1 $(INSTALLROOT)$(MANDIR)/man1/pftp.1
	install -d $(INSTALLROOT)$(MANDIR)/man5
	install -m$(MANMODE) netrc.5 $(INSTALLROOT)$(MANDIR)/man5

clean:

Lines 1-3 Link Here

(-)netkit-ftp-old/ftp/cmds.c (-10 / +7 lines)
		1	/* $USAGI$ */
		2
1	/*	3	/*
2	* Copyright (c) 1985, 1989 Regents of the University of California.	4	* Copyright (c) 1985, 1989 Regents of the University of California.
3	* All rights reserved.	5	* All rights reserved.
Lines 190-196 Link Here
190	setpeer(int argc, char *argv[])	192	setpeer(int argc, char *argv[])
191	{	193	{
192	char *host;	194	char *host;
193	unsigned short port;	195	char *port;
194		196
195	if (connected) {	197	if (connected) {
196	printf("Already connected to %s, use close first.\n",	198	printf("Already connected to %s, use close first.\n",
Lines 205-211 Link Here
205	code = -1;	207	code = -1;
206	return;	208	return;
207	}	209	}
208	port = ftp_port;	210	port = NULL;
209	if (argc > 2) {	211	if (argc > 2) {
210	#ifdef USE_SSL	212	#ifdef USE_SSL
211	/* not really an SSL enhancement but something that	213	/* not really an SSL enhancement but something that
Lines 233-252 Link Here
233	}	235	}
234	} else	236	} else
235	#endif /* USE_SSL */	237	#endif /* USE_SSL */
236	port = atoi(argv[2]);	238	port = argv[2];
237	if (port < 1) {
238	printf("%s: bad port number-- %s\n", argv[1], argv[2]);
239	printf ("usage: %s host-name [port]\n", argv[0]);
240	code = -1;
241	return;
242	}
243	port = htons(port);
244	}	239	}
245	host = hookup(argv[1], port);	240	host = hookup(argv[1], port);
246	if (host) {	241	if (host) {
247	int overbose;	242	int overbose;
248		243
249	connected = 1;	244	connected = 1;
		245	try_epsv = 1;
		246	try_eprt = 1;
250	/*	247	/*
251	* Set up defaults for FTP.	248	* Set up defaults for FTP.
252	*/	249	*/




 *
 */

/* $USAGI$ */
 
/*
 * Copyright (C) 1997 and 1998 WIDE Project.
 * All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 3. Neither the name of the project nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
 * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
*/

/*
 * Copyright (c) 1985, 1989 Regents of the University of California.
 * All rights reserved.

#include "ftp_var.h"
#include "cmds.h"

#ifdef _USAGI
#include "version.h"
#else
#include "../version.h"
#endif

union sockunion {
	struct sockinet {
		u_short	si_family;
		u_short	si_port;
	} su_si;
	struct	sockaddr		su_sa;
	struct	sockaddr_in  		su_sin;
#ifdef INET6
	struct	sockaddr_in6 		su_sin6;
#endif
};
#define	su_family	su_sa.sa_family
#define	su_port		su_si.si_port

#ifdef INET6
#define ex_af2prot(a) (a == AF_INET ? 1 : (a == AF_INET6 ? 2 : 0))
#else
#define ex_af2prot(a) (a == AF_INET ? 1 : 0)
#endif

int data = -1;
off_t restart_point = 0;

static union sockunion hisctladdr;
static union sockunion data_addr;
static union sockunion myctladdr;
static int ptflag = 0;
static sigjmp_buf recvabort;
static sigjmp_buf sendabort;

static FILE *dataconn(const char *);

char *
hookup(const char *host, const char *port)
{
	int s, tos, error;
	int s, tos;
	socklen_t len;
	static char hostnamebuf[256];
	struct addrinfo hints, *res, *res0;
	char hbuf[MAXHOSTNAMELEN], pbuf[NI_MAXSERV];
	char *cause = "ftp: unknown";

	if (port) {
		strncpy(pbuf, port, sizeof(pbuf) - 1);
		pbuf[sizeof(pbuf) - 1] = '\0';
	} else {
		sprintf(pbuf, "%d", ntohs(ftp_port));
	}
	memset(&hisctladdr, 0, sizeof(hisctladdr));
	memset(&hints, 0, sizeof(hints));
	hints.ai_flags = AI_CANONNAME;
	hints.ai_socktype = SOCK_STREAM;
	error = getaddrinfo(host, pbuf, &hints, &res0);
	if (error) {
		if (port) {
			strcpy(hbuf, " ");
		} else {
			hbuf[0] = '\0';
			pbuf[0] = '\0';
			code = -1;
			return((char *) 0);
		}
		fprintf(stderr, "ftp: %s%s%s: %s\n", host, hbuf, pbuf,
						gai_strerror(error));
			hp->h_length = sizeof(hisctladdr.sin_addr);
		}
		memcpy(&hisctladdr.sin_addr, hp->h_addr_list[0], hp->h_length);
		(void) strncpy(hostnamebuf, hp->h_name, sizeof(hostnamebuf));
		hostnamebuf[sizeof(hostnamebuf)-1] = 0;
	}
	hostname = hostnamebuf;
	s = socket(hisctladdr.sin_family, SOCK_STREAM, 0);
	if (s < 0) {
		perror("ftp: socket");
		code = -1;
		return (0);
	}

	if (res0->ai_canonname) {
		struct addrinfo h, *a;
		memset(&h, 0, sizeof(h));
		h.ai_family = PF_UNSPEC;
		h.ai_socktype = SOCK_STREAM;
		h.ai_flags = AI_NUMERICHOST;
		if (!getaddrinfo(res0->ai_canonname, NULL, &h, &a)) {
			strncpy(hostnamebuf, res0->ai_canonname, sizeof(hostnamebuf));
			freeaddrinfo(a);
		} else
			strncpy(hostnamebuf, host, sizeof(hostnamebuf));
	}
	else
		strncpy(hostnamebuf, host, sizeof(hostnamebuf));
	hostnamebuf[sizeof(hostnamebuf) - 1] = '\0';
	hostname = hostnamebuf;
	
	s = -1;
	for (res = res0; res; res = res->ai_next) {
		if (!ex_af2prot(res->ai_family)) {
			cause = "ftp: mismatch address family";
			errno = EPROTONOSUPPORT;
			continue;
		}
		if ((size_t)res->ai_addrlen > sizeof(hisctladdr)) {
			cause = "ftp: mismatch struct sockaddr size";
			errno = EPROTO;
			continue;
		}
		if (getnameinfo(res->ai_addr, res->ai_addrlen,
				hbuf, sizeof(hbuf), NULL, 0,
				NI_NUMERICHOST))
			strcpy(hbuf, "???");
		if (res0->ai_next)	/* if we have multiple possibilities */
			fprintf(stdout, "Trying %s...\n", hbuf);
		s = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
		if (s < 0) {
			cause = "ftp: socket";
			continue;
		}
		while ((error = connect(s, res->ai_addr, res->ai_addrlen)) < 0
				&& errno == EINTR) {
			;
		}
		if (error) {
			/* this "if" clause is to prevent print warning twice */
			if (res->ai_next) {
				fprintf(stderr,
					"ftp: connect to address %s\n", hbuf);
				perror("");
			}
			cause = "ftp: connect";
			close(s);
			s = -1;
			continue;
		}
		/* finally we got one */
		break;
	}
	if (s < 0) {
		perror(cause);
		code = -1;
		freeaddrinfo(res0);
		return NULL;
	}
	len = res->ai_addrlen;
	memcpy(&hisctladdr, res->ai_addr, len);
	freeaddrinfo(res0);
	if (getsockname(s, (struct sockaddr *)&myctladdr, &len) < 0) {
		perror("ftp: getsockname");
		code = -1;
		goto bad;
	}
#ifdef IP_TOS
	if (hisctladdr.su_family == AF_INET)
	{
	tos = IPTOS_LOWDELAY;
	if (setsockopt(s, IPPROTO_IP, IP_TOS, (char *)&tos, sizeof(int)) < 0)
		perror("ftp: setsockopt TOS (ignored)");
	}
#endif
	cin = fdopen(s, "r");
	cout = fdopen(s, "w");

		goto bad;
	}
	if (verbose)
		printf("Connected to %s (%s).\n", hostname, hbuf);
	if (getreply(0) > 2) { 	/* read startup message from server */
		if (cin)
			(void) fclose(cin);

			}
			if (dig < 4 && isdigit(c))
				code = code * 10 + (c - '0');
			if (!pflag && (code == 227 || code == 228))
				pflag = 1;
			else if (!pflag && code == 229)
				pflag = 100;
			if (dig > 4 && pflag == 1 && isdigit(c))
				pflag = 2;
			if (pflag == 2) {

					pflag = 3;
				}
			}
			if (pflag == 100 && c == '(')
				pflag = 2;
			if (dig == 4 && c == '-') {
				if (continuation)
					code = 0;

static int
initconn(void)
{
	u_char *p, *a;
	int result, tmpno = 0;
	socklen_t len;
	int on = 1;
	int tos, error = 0;
	u_int ad[16], po[2], af, alen, plen;
	char *pasvcmd = NULL;
	char hbuf[MAXHOSTNAMELEN], pbuf[NI_MAXSERV];

#ifdef INET6
	if (myctladdr.su_family == AF_INET6
	 && (IN6_IS_ADDR_LINKLOCAL(&myctladdr.su_sin6.sin6_addr)
	  || IN6_IS_ADDR_SITELOCAL(&myctladdr.su_sin6.sin6_addr))) {
		fprintf(stderr, "use of scoped address can be troublesome\n");
	}
#endif
	if (passivemode) {
		data_addr = hisctladdr;
		data = socket(data_addr.su_family, SOCK_STREAM, 0);
		if (data < 0) {
			perror("ftp: socket");
			return(1);

		    setsockopt(data, SOL_SOCKET, SO_DEBUG, (char *)&on,
			       sizeof (on)) < 0)
			perror("ftp: setsockopt (ignored)");
		switch (data_addr.su_family) {
		case AF_INET:
#if 0
			if (try_epsv) {
				result = command(pasvcmd = "EPSV 1");
				if (code / 10 == 22 && code != 229) {
					fprintf(stderr,
				  "wrong server: return code must be 229\n");
					result = COMPLETE + 1;
				}
			} else {
#endif
			result = COMPLETE + 1;

			if (result != COMPLETE) {
				try_epsv = 0;
				result = command(pasvcmd = "PASV");
			}
			break;
#ifdef INET6
		case AF_INET6:
			if (try_epsv) {
				result = command(pasvcmd = "EPSV 2");
				if (code / 10 == 22 && code != 229) {
					fprintf(stderr,
				  "wrong server: return code must be 229\n");
					result = COMPLETE + 1;
				}
			} else {
				result = COMPLETE + 1;
			}
			if (result != COMPLETE) {
				try_epsv = 0;
				result = command(pasvcmd = "LPSV");
			}
			break;
#endif
		default:
			result = COMPLETE + 1;
			break;
		}
		if (result != COMPLETE) {
			printf("Passive mode refused.\n");
			goto bad;
		}

#define pack2(var) \
	(((var[0] & 0xff) << 8) | ((var[1] & 0xff) << 0))
#define pack4(var) \
	((((var)[0] & 0xff) << 24) | (((var)[1] & 0xff) << 16) | \
	 (((var)[2] & 0xff) << 8) | (((var)[3] & 0xff) << 0))

		/*
		 * What we've got at this point is a string of comma separated
		 * one-byte unsigned integer values, separated by commas.
		 * The first four are the an IP address. The fifth is the MSB
		 * of the port number, the sixth is the LSB. From that we'll
		 * prepare a sockaddr_in.
		 */
		error = 0;
		if (strcmp(pasvcmd, "PASV") == 0) {
			if (data_addr.su_family != AF_INET) {
				error = 2;
				goto psv_done;
			}
			if (code / 10 == 22 && code != 227) {
				error = 227;
				goto psv_done;
			}
			if (sscanf(pasv, "%u,%u,%u,%u,%u,%u",
					&ad[0], &ad[1], &ad[2], &ad[3],
					&po[0], &po[1]) != 6) {
				error = 1;
				goto psv_done;
			}
			data_addr.su_sin.sin_addr.s_addr = htonl(pack4(ad));
			data_addr.su_port = htons(pack2(po));
		} else
		    if (strcmp(pasvcmd, "LPSV") == 0) {
			if (code / 10 == 22 && code != 228) {
				error = 228;
				goto psv_done;
			}
			switch (data_addr.su_family) {
			case AF_INET:
				if (sscanf(pasv, "%u,%u,%u,%u,%u,%u,%u,%u,%u",
						&af, &alen,
						&ad[0], &ad[1], &ad[2], &ad[3],
						&plen, &po[0], &po[1]) != 9) {
					error = 1;
					goto psv_done;
				}
				if (af != 4 || alen != 4 || plen != 2) {
					error = 2;
					goto psv_done;
				}
				data_addr.su_sin.sin_addr.s_addr =
							htonl(pack4(ad));
				data_addr.su_port = htons(pack2(po));
				break;
#ifdef INET6
			case AF_INET6:
				if (sscanf(pasv,
	"%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u",
				  &af, &alen,
				  &ad[0], &ad[1], &ad[2], &ad[3],
				  &ad[4], &ad[5], &ad[6], &ad[7],
				  &ad[8], &ad[9], &ad[10], &ad[11],
				  &ad[12], &ad[13], &ad[14], &ad[15],
				  &plen, &po[0], &po[1]) != 21) {
					error = 1;
					goto psv_done;
				}
				if (af != 6 || alen != 16 || plen != 2) {
					error = 2;
					goto psv_done;
				}
				data_addr.su_sin6.sin6_addr.s6_addr32[0] =
							htonl(pack4(ad));
				data_addr.su_sin6.sin6_addr.s6_addr32[1] =
							htonl(pack4(ad+4));
				data_addr.su_sin6.sin6_addr.s6_addr32[2] =
							htonl(pack4(ad+8));
				data_addr.su_sin6.sin6_addr.s6_addr32[3] =
							htonl(pack4(ad+12));
				data_addr.su_port = htons(pack2(po));
				break;
#endif
			default:
				error = 1;
			}
		} else if (strncmp(pasvcmd, "EPSV", 4) == 0) {
			char delim[4];
			u_int epsvpo;

			if (code / 10 == 22 && code != 229) {
				error = 229;
				goto psv_done;
			}
			if (sscanf(pasv, "%c%c%c%u%c", &delim[0], &delim[1],
					&delim[2], &epsvpo, &delim[3]) != 5) {
				error = 1;
				goto psv_done;
			}
			if (delim[0] != delim[1] || delim[0] != delim[2]
			 || delim[0] != delim[3]) {
				error = 1;
				goto psv_done;
			}
			data_addr.su_port = htons(epsvpo);
		} else {
			error = 1;
		}
psv_done:
		switch (error) {
		case 0:
			break;
		case 1:
			fprintf(stderr,
		  "Passive mode address scan failure. Shouldn't happen!\n");
			goto bad;
		case 2:
			fprintf(stderr,
			  "Passive mode AF mismatch. Shouldn't happen!\n");
			goto bad;
		case 227:
		case 228:
		case 229:
			fprintf(stderr,
			  "wrong server: return code must be %d\n", error);
			goto bad;
		default:
			fprintf(stderr, "Bug\n");
		}

		data_addr.sin_family = AF_INET;
		data_addr.sin_addr.s_addr = htonl((a1 << 24) | (a2 << 16) |
						  (a3 << 8) | a4);
		data_addr.sin_port = htons((p1 << 8) | p2);

		if (connect(data, (struct sockaddr *) &data_addr,
		    sizeof(data_addr))<0) {

			return(1);
		}
#ifdef IP_TOS
		if (data_addr.su_family == AF_INET)
		{
		tos = IPTOS_THROUGHPUT;
		if (setsockopt(data, IPPROTO_IP, IP_TOS, (char *)&tos,
		    sizeof(tos)) < 0)
			perror("ftp: setsockopt TOS (ignored)");
		}
#endif
		return(0);
	}
noport:
	data_addr = myctladdr;
	if (sendport)
		data_addr.su_port = 0;	/* let system pick one */ 
	if (data != -1)
		(void) close(data);
	data = socket(data_addr.su_family, SOCK_STREAM, 0);
	if (data < 0) {
		perror("ftp: socket");
		if (tmpno)

	if (listen(data, 1) < 0)
		perror("ftp: listen");
	if (sendport) {
		af = ex_af2prot(data_addr.su_family);
		if (try_eprt && af > 1) {      /* only IPv6 */
			if (getnameinfo((struct sockaddr *)&data_addr, len,
					hbuf, sizeof(hbuf), pbuf, sizeof(pbuf),
					NI_NUMERICHOST | NI_NUMERICSERV) == 0) {
				result = command("EPRT |%d|%s|%s|",
							af, hbuf, pbuf);
				if (result != COMPLETE) {
					try_eprt = 0;
				}
			} else {
				result = ERROR;
			}
		} else {
			result = COMPLETE + 1;
		}
		if (result == COMPLETE)
			goto prt_done;

		p = (u_char *)&data_addr.su_port;
		switch (data_addr.su_family) {
		case AF_INET:
			a = (u_char *)&data_addr.su_sin.sin_addr;
			result = command("PORT %u,%u,%u,%u,%u,%u",
				a[0], a[1], a[2], a[3], p[0], p[1]);
			break;
#ifdef INET6
		case AF_INET6:
			a = (u_char *)&data_addr.su_sin6.sin6_addr;
			result = command(
	"LPRT 6,16,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,2,%d,%d",
				a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7],
				a[8], a[9],a[10],a[11],a[12],a[13],a[14],a[15],
				p[0], p[1]);
			break;
#endif
		default:
			result = COMPLETE + 1; /* xxx */
		}

	prt_done:
		if (result == ERROR && sendport == -1) {
			sendport = 0;
			tmpno = 1;

	if (tmpno)
		sendport = 1;
#ifdef IP_TOS
	if (data_addr.su_family == AF_INET)
	{
	on = IPTOS_THROUGHPUT;
	if (setsockopt(data, IPPROTO_IP, IP_TOS, (char *)&on, sizeof(int)) < 0)
		perror("ftp: setsockopt TOS (ignored)");
	}
#endif
	return (0);
bad:

static FILE *
dataconn(const char *lmode)
{
	union sockunion from;
	int s, tos;
	socklen_t fromlen = sizeof(from);
	int ret;

	(void) close(data);
	data = s;
#ifdef IP_TOS
	if (from.su_family == AF_INET)
	{
	tos = IPTOS_THROUGHPUT;
	if (setsockopt(s, IPPROTO_IP, IP_TOS, (char *)&tos, sizeof(int)) < 0)
		perror("ftp: setsockopt TOS (ignored)");
	}
#endif

#ifdef USE_SSL

	static struct comvars {
		int connect;
		char name[MAXHOSTNAMELEN];
		union sockunion mctl;
		union sockunion hctl;
		FILE *in;
		FILE *out;
		int tpe;

	connected = op->connect;
	if (hostname) {
		(void) strncpy(ip->name, hostname, sizeof(ip->name) - 1);
		ip->name[sizeof(ip->name) - 1] = '\0';
	} 
	else {
		ip->name[0] = 0;

	ip->ntflg = ntflag;
	ntflag = op->ntflg;
	(void) strncpy(ip->nti, ntin, 16);
	(ip->nti)[16] = '\0';		/* shouldn't use strlen */
	(void) strcpy(ntin, op->nti);
	(void) strncpy(ip->nto, ntout, 16);
	(ip->nto)[16] = '\0';
	(void) strcpy(ntout, op->nto);
	ip->mapflg = mapflag;
	mapflag = op->mapflg;
	(void) strncpy(ip->mi, mapin, MAXPATHLEN - 1);
	(ip->mi)[MAXPATHLEN - 1] = '\0';
	(void) strcpy(mapin, op->mi);
	(void) strncpy(ip->mo, mapout, MAXPATHLEN - 1);
	(ip->mo)[MAXPATHLEN - 1] = '\0';
	(void) strcpy(mapout, op->mo);
	(void) signal(SIGINT, oldintr);
	if (abrtflag) {

Lines 1-3 Link Here

(-)netkit-ftp-old/ftp/ftp_var.h (-1 / +5 lines)
		1	/* $USAGI$ */
		2
1	/*	3	/*
2	* Copyright (c) 1985, 1989 Regents of the University of California.	4	* Copyright (c) 1985, 1989 Regents of the University of California.
3	* All rights reserved.	5	* All rights reserved.
Lines 112-117 Link Here
112	Extern int mflag; /* flag: if != 0, then active multi command */	114	Extern int mflag; /* flag: if != 0, then active multi command */
113		115
114	Extern int options; /* used during socket creation */	116	Extern int options; /* used during socket creation */
		117	Extern int try_epsv; /* try EPSV for this session */
		118	Extern int try_eprt; /* try EPRT for this session */
115		119
116	/*	120	/*
117	* Format of command table.	121	* Format of command table.
Lines 140-146 Link Here
140	Extern char macbuf[4096];	144	Extern char macbuf[4096];
141	#define MACBUF_SIZE 4096	145	#define MACBUF_SIZE 4096
142		146
143	char hookup(char host, int port);	147	char hookup(const char host, const char *port);
144	struct cmd getcmd(const char );	148	struct cmd getcmd(const char );
145	char *makeargv(int pargc, char **parg);	149	char *makeargv(int pargc, char **parg);
146	int dologin(const char *host);	150	int dologin(const char *host);

Return to bug 47507

Lines 19-28 Link Here

(-)netkit-ftp-old/ftp/Makefile (+3 lines)
19	cmds.o glob.o: glob.h	19	cmds.o glob.o: glob.h
20		20
21	install: ftp	21	install: ftp
		22	install -d $(INSTALLROOT)$(BINDIR)
22	install -s -m$(BINMODE) ftp $(INSTALLROOT)$(BINDIR)	23	install -s -m$(BINMODE) ftp $(INSTALLROOT)$(BINDIR)
23	ln -sf ftp $(INSTALLROOT)$(BINDIR)/pftp	24	ln -sf ftp $(INSTALLROOT)$(BINDIR)/pftp
		25	install -d $(INSTALLROOT)$(MANDIR)/man1
24	install -m$(MANMODE) ftp.1 $(INSTALLROOT)$(MANDIR)/man1	26	install -m$(MANMODE) ftp.1 $(INSTALLROOT)$(MANDIR)/man1
25	ln -sf ftp.1 $(INSTALLROOT)$(MANDIR)/man1/pftp.1	27	ln -sf ftp.1 $(INSTALLROOT)$(MANDIR)/man1/pftp.1
		28	install -d $(INSTALLROOT)$(MANDIR)/man5
26	install -m$(MANMODE) netrc.5 $(INSTALLROOT)$(MANDIR)/man5	29	install -m$(MANMODE) netrc.5 $(INSTALLROOT)$(MANDIR)/man5
27		30
28	clean:	31	clean: