Fix TFTP access control, broken earlier in release.

This commit is contained in:
Simon Kelley
2012-08-13 17:39:57 +01:00
parent fd05f12790
commit 3169daad46

View File

@@ -113,7 +113,6 @@ void tftp_request(struct listener *listen, time_t now)
else else
{ {
struct cmsghdr *cmptr; struct cmsghdr *cmptr;
int check;
if (msg.msg_controllen < sizeof(struct cmsghdr)) if (msg.msg_controllen < sizeof(struct cmsghdr))
return; return;
@@ -193,10 +192,14 @@ void tftp_request(struct listener *listen, time_t now)
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
if (listen->family == AF_INET6) if (listen->family == AF_INET6)
check = iface_check(AF_INET6, (struct all_addr *)&addr.in6.sin6_addr, name); {
if (!iface_check(AF_INET6, (struct all_addr *)&addr.in6.sin6_addr, name))
return;
}
else else
#endif #endif
check = iface_check(AF_INET, (struct all_addr *)&addr.in.sin_addr, name); if (!iface_check(AF_INET, (struct all_addr *)&addr.in.sin_addr, name))
return;
#ifdef HAVE_DHCP #ifdef HAVE_DHCP
/* allowed interfaces are the same as for DHCP */ /* allowed interfaces are the same as for DHCP */