Module Name:	basesrc
Committed By:	lukem
Date:		Sun Dec 23 12:23:03 UTC 2001

Modified Files:
	basesrc/usr.bin/ftp: fetch.c ftp.1 ftp.c ftp_var.h main.c version.h

Log Message:
Add -4 to force IPv4 and -6 to force IPv6 address usage.
From Hajimu UMEMOTO, via Mike Heffner of FreeBSD.

(FreeBSD has imported NetBSD's ftp as their ftp client;
Mike is sending back some of their local changes).


To generate a diff of this commit:
cvs rdiff -r1.130 -r1.131 basesrc/usr.bin/ftp/fetch.c
cvs rdiff -r1.78 -r1.79 basesrc/usr.bin/ftp/ftp.1
cvs rdiff -r1.115 -r1.116 basesrc/usr.bin/ftp/ftp.c
cvs rdiff -r1.60 -r1.61 basesrc/usr.bin/ftp/ftp_var.h
cvs rdiff -r1.77 -r1.78 basesrc/usr.bin/ftp/main.c
cvs rdiff -r1.25 -r1.26 basesrc/usr.bin/ftp/version.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.