Module Name: othersrc
Committed By: lukem
Date: Tue Jan 29 13:35:58 UTC 2019
Modified Files:
othersrc/libexec/tnftpd/src: tnftpd.manin
Log Message:
merge changes from ftpd.8 1.85 - 1.87
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 othersrc/libexec/tnftpd/src/tnftpd.manin
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/libexec/tnftpd/src/tnftpd.manin
diff -u othersrc/libexec/tnftpd/src/tnftpd.manin:1.2 othersrc/libexec/tnftpd/src/tnftpd.manin:1.3
--- othersrc/libexec/tnftpd/src/tnftpd.manin:1.2 Mon Jan 4 01:10:43 2010
+++ othersrc/libexec/tnftpd/src/tnftpd.manin Tue Jan 29 13:35:58 2019
@@ -1,5 +1,5 @@
-.\" $NetBSD: tnftpd.manin,v 1.2 2010/01/04 01:10:43 lukem Exp $
-.\" from NetBSD: ftpd.8,v 1.85 2009/05/01 10:53:27 wiz Exp
+.\" $NetBSD: tnftpd.manin,v 1.3 2019/01/29 13:35:58 lukem Exp $
++.\" from NetBSD: ftpd.8,v 1.87 2018/04/28 13:38:00 riastradh Exp
.\"
.\" Copyright (c) 1997-2008 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -66,7 +66,7 @@
Internet File Transfer Protocol server
.Sh SYNOPSIS
.Nm
-.Op Fl 46DdHlnQqrsUuWwX
+.Op Fl 46DdfHlnQqrsUuWwX
.Op Fl a Ar anondir
.Op Fl C Ar user Ns Op @ Ns Ar host
.Op Fl c Ar confdir
@@ -155,6 +155,10 @@ for the
.Dq "\&%E"
escape sequence (see
.Sx Display file escape sequences )
+.It Fl f
+Stops the
+.Fl D
+flag from detaching from the tty and going into the background.
.It Fl H
Equivalent to
.Do
@@ -279,7 +283,7 @@ style
.Pa xferlog
file suitable for input into a third-party log analysis tool with a command
similar to:
-.Dl "sed -ne 's/^.*xferlog: //p' /var/log/xferlog \*[Gt] wuxferlog"
+.Dl "sed -ne 's/^.*xferlog: //p' /var/log/xferlog > wuxferlog"
.El
.Pp
The file
