Module Name:	othersrc
Committed By:	lukem
Date:		Sat May 14 03:50:50 UTC 2005

Update of /cvsroot/othersrc/usr.bin/tnftp/src
In directory ivanova.netbsd.org:/tmp/cvs-serv230

Log Message:
Update to NetBSD-ftp 20051113:
* Correct the "optlen" argument passed to getsockopt(3) and setsockopt(3)
  in various places.  Fixes a problem noted by Allen Briggs.
* Improve warning printed when connect(2) for the data channel fails.


Vendor Tag:	NetBSD
Release Tags:	NetBSD-20050513
		
C othersrc/usr.bin/tnftp/src/Makefile
C othersrc/usr.bin/tnftp/src/cmds.c
C othersrc/usr.bin/tnftp/src/cmdtab.c
C othersrc/usr.bin/tnftp/src/complete.c
C othersrc/usr.bin/tnftp/src/domacro.c
C othersrc/usr.bin/tnftp/src/extern.h
C othersrc/usr.bin/tnftp/src/fetch.c
C othersrc/usr.bin/tnftp/src/ftp.1
C othersrc/usr.bin/tnftp/src/ftp.c
C othersrc/usr.bin/tnftp/src/ftp_var.h
C othersrc/usr.bin/tnftp/src/main.c
C othersrc/usr.bin/tnftp/src/progressbar.c
C othersrc/usr.bin/tnftp/src/progressbar.h
C othersrc/usr.bin/tnftp/src/ruserpass.c
C othersrc/usr.bin/tnftp/src/util.c
U othersrc/usr.bin/tnftp/src/version.h

15 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jNetBSD:yesterday -jNetBSD othersrc/usr.bin/tnftp/src