forked from mirrors/tftp-hpa-google
		
	Fix compilation snafus; add note that mapping file changes require SIGHUP.
This commit is contained in:
		
							parent
							
								
									acf458d957
								
							
						
					
					
						commit
						3444b4d18c
					
				
					 2 changed files with 11 additions and 6 deletions
				
			
		| 
						 | 
					@ -35,7 +35,7 @@
 | 
				
			||||||
.\"	from: @(#)tftpd.8	6.7 (Berkeley) 5/13/91
 | 
					.\"	from: @(#)tftpd.8	6.7 (Berkeley) 5/13/91
 | 
				
			||||||
.\"	$OpenBSD: tftpd.8,v 1.7 1999/07/09 13:35:51 aaron Exp $
 | 
					.\"	$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
 | 
					.Dt TFTPD 8
 | 
				
			||||||
.Os
 | 
					.Os
 | 
				
			||||||
.Sh NAME
 | 
					.Sh NAME
 | 
				
			||||||
| 
						 | 
					@ -205,6 +205,11 @@ This rule applies to GET (RRQ) requests only.
 | 
				
			||||||
.It Ic P
 | 
					.It Ic P
 | 
				
			||||||
This rule applies to PUT (WRQ) requests only.
 | 
					This rule applies to PUT (WRQ) requests only.
 | 
				
			||||||
.El
 | 
					.El
 | 
				
			||||||
 | 
					.Pp
 | 
				
			||||||
 | 
					If the mapping file is changed, you need to send SIGHUP
 | 
				
			||||||
 | 
					(kill -HUP) to any outstanding
 | 
				
			||||||
 | 
					.Nm
 | 
				
			||||||
 | 
					process.
 | 
				
			||||||
.Sh SEE ALSO
 | 
					.Sh SEE ALSO
 | 
				
			||||||
.Xr tftp 1 ,
 | 
					.Xr tftp 1 ,
 | 
				
			||||||
.Xr egrep 1 ,
 | 
					.Xr egrep 1 ,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -85,8 +85,6 @@ static const char *rcsid = "tftp-hpa $Id$";
 | 
				
			||||||
int deny_severity	= LOG_WARNING;
 | 
					int deny_severity	= LOG_WARNING;
 | 
				
			||||||
int allow_severity	= -1;	/* Don't log at all */
 | 
					int allow_severity	= -1;	/* Don't log at all */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
int verbosity = 0;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
struct request_info wrap_request;
 | 
					struct request_info wrap_request;
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -129,6 +127,8 @@ char	**dirs;
 | 
				
			||||||
int	secure = 0;
 | 
					int	secure = 0;
 | 
				
			||||||
int	cancreate = 0;
 | 
					int	cancreate = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					int verbosity = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct formats;
 | 
					struct formats;
 | 
				
			||||||
static struct rule *rewrite_rules = NULL;
 | 
					static struct rule *rewrite_rules = NULL;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -481,11 +481,11 @@ tftp(struct tftphdr *tp, int size)
 | 
				
			||||||
	if ( verbosity >= 1 ) {
 | 
						if ( verbosity >= 1 ) {
 | 
				
			||||||
	  if ( filename == origfilename || !strcmp(filename, origfilename) )
 | 
						  if ( filename == origfilename || !strcmp(filename, origfilename) )
 | 
				
			||||||
	    syslog(LOG_NOTICE, "%s from %s filename %s\n",
 | 
						    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);
 | 
							   inet_ntoa(from.sin_addr), filename);
 | 
				
			||||||
	  else
 | 
						  else
 | 
				
			||||||
	    syslog(LOG_NOTICE, "%s from %s filename %s remapped to %s\n",
 | 
						    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);
 | 
							   inet_ntoa(from.sin_addr), origfilename, filename);
 | 
				
			||||||
	}		   
 | 
						}		   
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue