Module Name: othersrc
Committed By: lukem
Date: Sun Nov 15 10:16:04 UTC 2009
Modified Files:
othersrc/usr.bin/tnftp: ChangeLog
Log Message:
sync to NetBSD-ftp 20090915
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 othersrc/usr.bin/tnftp/ChangeLog
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/usr.bin/tnftp/ChangeLog
diff -u othersrc/usr.bin/tnftp/ChangeLog:1.53 othersrc/usr.bin/tnftp/ChangeLog:1.54
--- othersrc/usr.bin/tnftp/ChangeLog:1.53 Sat Nov 14 11:55:16 2009
+++ othersrc/usr.bin/tnftp/ChangeLog Sun Nov 15 10:16:04 2009
@@ -1,4 +1,11 @@
-$NetBSD: ChangeLog,v 1.53 2009/11/14 11:55:16 lukem Exp $
+$NetBSD: ChangeLog,v 1.54 2009/11/15 10:16:04 lukem Exp $
+
+Sun Nov 15 10:14:44 UTC 2009 lukem
+
+ * Merge NetBSD ftp from 20090520 to 20090915. Change:
+ - Rename internal getline() to get_line() to avoid
+ conflict with libc with former.
+ - Avoid a NULL dereference in an error message.
Sat Nov 14 09:21:19 UTC 2009 lukem
@@ -29,7 +36,7 @@
Fixes PR 35630.
- Add epsv6 and epsv to disable extended passive mode for ipv6 or
both ipv4 and ipv6 respectively. This hack is due to our
- friends a Juniper Networks who break epsv in ipv6.
+ friends a Juniper Networks who break epsv in ipv6.
Should be fixed in ScreenOS 6.2.X.
- Improve parsing of chunked transfer chunks per RFC2616:
- more stringent chunk-size parsing
