diff options
| -rw-r--r-- | usr.sbin/tftpd/tftpd.8 | 18 | ||||
| -rw-r--r-- | usr.sbin/tftpd/tftpd.c | 4 |
2 files changed, 9 insertions, 13 deletions
diff --git a/usr.sbin/tftpd/tftpd.8 b/usr.sbin/tftpd/tftpd.8 index 568dc1e86d6..0a02f7eb95e 100644 --- a/usr.sbin/tftpd/tftpd.8 +++ b/usr.sbin/tftpd/tftpd.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: tftpd.8,v 1.1 2012/03/02 04:43:13 dlg Exp $ +.\" $OpenBSD: tftpd.8,v 1.2 2012/03/02 16:39:22 jmc Exp $ .\" .\" Copyright (c) 1983, 1991 The Regents of the University of California. .\" All rights reserved. @@ -34,15 +34,13 @@ .Os .Sh NAME .Nm tftpd -.Nd -.Tn DARPA -Trivial File Transfer Protocol daemon +.Nd DARPA Trivial File Transfer Protocol daemon .Sh SYNOPSIS .Nm tftpd .Op Fl 46cdv .Op Fl l Ar address .Op Fl p Ar port -.Op Fl r socket +.Op Fl r Ar socket .Ar directory .Sh DESCRIPTION .Nm @@ -91,12 +89,8 @@ allowing anyone to read or write to them. Do not daemonize. If this option is specified, .Nm -will run in the foreground and log to stderr. -.It Fl v -Log the client IP, type of request, and filename. -.Fl d -implies -.Fl v . +will run in the foreground and log +the client IP, type of request, and filename to stderr. .It Fl l Ar address Listen on the specified address. By default @@ -115,6 +109,8 @@ Issue filename rewrite requests to the specified UNIX domain socket. By default .Nm does not use filename rewriting. +.It Fl v +Log the client IP, type of request, and filename. .It Ar directory .Xr chroot 2 to diff --git a/usr.sbin/tftpd/tftpd.c b/usr.sbin/tftpd/tftpd.c index 3456eb46dba..810a55c4ac9 100644 --- a/usr.sbin/tftpd/tftpd.c +++ b/usr.sbin/tftpd/tftpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tftpd.c,v 1.2 2012/03/02 04:51:21 dlg Exp $ */ +/* $OpenBSD: tftpd.c,v 1.3 2012/03/02 16:39:22 jmc Exp $ */ /* * Copyright (c) 2012 David Gwynne <dlg@uq.edu.au> @@ -253,7 +253,7 @@ __dead void usage(void) { extern char *__progname; - fprintf(stderr, "usage: %s [-46cdv] [-l addr] [-p port] [-r sock]" + fprintf(stderr, "usage: %s [-46cdv] [-l address] [-p port] [-r socket]" " directory\n", __progname); exit(1); } |