forks/tftp-hpa-google
1
0
Fork 0
forked from mirrors/tftp-hpa-google
Code Pull requests Releases 1 Activity

*** empty log message ***

Browse source
This commit is contained in:
hpa 2001-04-23 19:59:47 +00:00
parent 6c5cce691c
commit 849efd27b3
3 changed files with 34 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tftpd/Makefile
View file

@ -1,7 +1,7 @@
all: tftpd all: tftpd
include ../MCONFIG -include ../MCONFIG
include ../MRULES -include ../MRULES
OBJS = tftpd.o tftpsubs.o recvfrom.o OBJS = tftpd.o tftpsubs.o recvfrom.o

19
tftpd/recvfrom.c
View file

@ -33,11 +33,26 @@
#include <sys/uio.h> #include <sys/uio.h>
#ifdef IP_PKTINFO
# ifndef HAVE_STRUCT_IN_PKTINFO
# ifdef __linux__
/* Assume this version of glibc simply lacks the definition */
struct in_pktinfo {
int ipi_ifindex;
struct in_addr ipi_spec_dst;
struct in_addr ipi_addr;
};
# else
# undef IP_PKTINFO /* No definition, no way to get it */
# endif
# endif
#endif
#ifndef CMSG_LEN #ifndef CMSG_LEN
#define CMSG_LEN(size) (sizeof(struct cmsghdr) + (size)) # define CMSG_LEN(size) (sizeof(struct cmsghdr) + (size))
#endif #endif
#ifndef CMSG_SPACE #ifndef CMSG_SPACE
#define CMSG_SPACE(size) (sizeof(struct cmsghdr) + (size)) # define CMSG_SPACE(size) (sizeof(struct cmsghdr) + (size))
#endif #endif
int int

15
tftpd/tftpd.c
View file

@ -76,6 +76,12 @@ static const char *rcsid = "tftp-hpa $Id$";
#include "tftpsubs.h" #include "tftpsubs.h"
#include "recvfrom.h" #include "recvfrom.h"
#ifdef HAVE_TCPWRAPPERS
#include <tcpd.h>
int deny_severity = LOG_WARNING;
int allow_severity = LOG_INFO;
#endif
void bsd_signal(int, void (*)(int)); void bsd_signal(int, void (*)(int));
#ifndef HAVE_SIGSETJMP #ifndef HAVE_SIGSETJMP
@ -248,6 +254,14 @@ main(int argc, char **argv)
syslog(LOG_ERR, "recvfrom: %m"); syslog(LOG_ERR, "recvfrom: %m");
exit(1); exit(1);
} }
#ifdef HAVE_TCPWRAPPERS
/* Verify if this was a legal request for us. */
if ( hosts_ctl("tftp", STRING_UNKNOWN, inet_ntoa(from.sin_addr), STRING_UNKNOWN) == 0 )
exit(1); /* Access denied */
#endif
/* /*
* Now that we have read the message out of the UDP * Now that we have read the message out of the UDP
* socket, we fork and exit. Thus, inetd will go back * socket, we fork and exit. Thus, inetd will go back
@ -296,6 +310,7 @@ main(int argc, char **argv)
alarm(0); alarm(0);
close(fd); close(fd);
close(1); close(1);
peer = socket(AF_INET, SOCK_DGRAM, 0); peer = socket(AF_INET, SOCK_DGRAM, 0);
if (peer < 0) { if (peer < 0) {
syslog(LOG_ERR, "socket: %m"); syslog(LOG_ERR, "socket: %m");