diff --git a/tftpd/tftpd.8 b/tftpd/tftpd.8 index 491e94e..ad35006 100644 --- a/tftpd/tftpd.8 +++ b/tftpd/tftpd.8 @@ -35,7 +35,7 @@ .\" from: @(#)tftpd.8 6.7 (Berkeley) 5/13/91 .\" $OpenBSD: tftpd.8,v 1.7 1999/07/09 13:35:51 aaron Exp $ .\" -.Dd Apr 23, 2001 +.Dd July 10, 2001 .Dt TFTPD 8 .Os .Sh NAME @@ -122,7 +122,7 @@ will run as; the default is ``nobody''. .Pp The .Fl m -flag specifies a file which contains filename remapping rules. +flag specifies a file which contains filename remapping rules. .Pp The .Fl v @@ -205,6 +205,11 @@ This rule applies to GET (RRQ) requests only. .It Ic P This rule applies to PUT (WRQ) requests only. .El +.Pp +If the mapping file is changed, you need to send SIGHUP +(kill -HUP) to any outstanding +.Nm +process. .Sh SEE ALSO .Xr tftp 1 , .Xr egrep 1 , diff --git a/tftpd/tftpd.c b/tftpd/tftpd.c index e4d40e9..f97791d 100644 --- a/tftpd/tftpd.c +++ b/tftpd/tftpd.c @@ -85,8 +85,6 @@ static const char *rcsid = "tftp-hpa $Id$"; int deny_severity = LOG_WARNING; int allow_severity = -1; /* Don't log at all */ -int verbosity = 0; - struct request_info wrap_request; #endif @@ -129,6 +127,8 @@ char **dirs; int secure = 0; int cancreate = 0; +int verbosity = 0; + struct formats; static struct rule *rewrite_rules = NULL; @@ -481,11 +481,11 @@ tftp(struct tftphdr *tp, int size) if ( verbosity >= 1 ) { if ( filename == origfilename || !strcmp(filename, origfilename) ) syslog(LOG_NOTICE, "%s from %s filename %s\n", - opcode[tp->th_opcode] == WRQ ? "WRQ" : "RRQ", + tp->th_opcode == WRQ ? "WRQ" : "RRQ", inet_ntoa(from.sin_addr), filename); else syslog(LOG_NOTICE, "%s from %s filename %s remapped to %s\n", - opcode[tp->th_opcode] == WRQ ? "WRQ" : "RRQ", + tp->th_opcode == WRQ ? "WRQ" : "RRQ", inet_ntoa(from.sin_addr), origfilename, filename); }