|
 |
91c661 |
--- tftp-hpa-5.2/tftp/main.c 2013-04-19 09:34:09.737410319 +0200
|
|
|
91c661 |
+++ tftp-hpa-5.2/tftp/main.c 2013-04-19 09:42:53.559946374 +0200
|
|
|
91c661 |
@@ -195,9 +195,11 @@
|
|
|
91c661 |
{
|
|
|
91c661 |
fprintf(stderr,
|
|
|
91c661 |
#ifdef HAVE_IPV6
|
|
|
91c661 |
- "Usage: %s [-4][-6][-v][-l][-m mode] [host [port]] [-c command]\n",
|
|
|
91c661 |
+ "Usage: %s [-4][-6][-v][-V][-l][-m mode] [-R port:port] "
|
|
|
91c661 |
+ "[host [port]] [-c command]\n",
|
|
|
91c661 |
#else
|
|
|
91c661 |
- "Usage: %s [-v][-l][-m mode] [host [port]] [-c command]\n",
|
|
|
91c661 |
+ "Usage: %s [-v][-V][-l][-m mode] [-R port:port] "
|
|
|
91c661 |
+ "[host [port]] [-c command]\n",
|
|
|
91c661 |
#endif
|
|
|
91c661 |
program);
|
|
|
91c661 |
exit(errcode);
|
|
|
91c661 |
--- tftp-hpa-5.2/tftpd/tftpd.8.in 2012-11-20 09:43:46.000000000 +0100
|
|
|
91c661 |
+++ tftp-hpa-5.2/tftpd/tftpd.8.in 2013-04-19 09:44:37.399057279 +0200
|
|
|
91c661 |
@@ -155,7 +155,7 @@
|
|
|
91c661 |
.B utimeout
|
|
|
91c661 |
option is negotiated. The default is 1000000 (1 second.)
|
|
|
91c661 |
.TP
|
|
|
91c661 |
-\fB\-\-mapfile\fP \fIremap-file\fP, \fB\-m\fP \fIremap-file\fP
|
|
|
91c661 |
+\fB\-\-map\-file\fP \fIremap-file\fP, \fB\-m\fP \fIremap-file\fP
|
|
|
91c661 |
Specify the use of filename remapping. The
|
|
|
91c661 |
.I remap-file
|
|
|
91c661 |
is a file containing the remapping rules. See the section on filename
|
|
|
91c661 |
@@ -243,7 +243,7 @@ option, but crash with an error if they
|
|
|
91c661 |
accepted by the server.
|
|
|
91c661 |
.SH "FILENAME REMAPPING"
|
|
|
91c661 |
The
|
|
|
91c661 |
-.B \-\-mapfile
|
|
|
91c661 |
+.B \-\-map\-file
|
|
|
91c661 |
option specifies a file which contains filename remapping rules. Each
|
|
|
91c661 |
non-comment line (comments begin with hash marks,
|
|
|
91c661 |
.BR # )
|
|
|
91c661 |
@@ -395,7 +395,7 @@ flag is used to set up a chroot() enviro
|
|
|
91c661 |
once a connection has been set up.
|
|
|
91c661 |
.PP
|
|
|
91c661 |
Finally, the filename remapping
|
|
|
91c661 |
-.RB ( \-\-mapfile
|
|
|
91c661 |
+.RB ( \-\-map\-file
|
|
|
91c661 |
flag) support can be used to provide a limited amount of additional
|
|
|
91c661 |
access control.
|
|
|
91c661 |
.SH "CONFORMING TO"
|