Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 10:18:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Accumulated 2.60 changes going into git

Browse Source
This commit is contained in:
Simon Kelley
2012-01-05 21:33:27 +00:00
parent 74c95c2542
commit c72daea868
55 changed files with 7218 additions and 3850 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/rfc2131.c
View File

@@ -481,7 +481,7 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
if (!message &&
!lease &&
(!(lease = lease_allocate(mess->yiaddr))))
(!(lease = lease_allocate4(mess->yiaddr))))
message = _("no leases left");
if (!message)
@@ -521,11 +521,10 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
pp = op;
/* Always force update, since the client has no way to do it itself. */
if (!(fqdn_flags & 0x01))
fqdn_flags |= 0x02;
if (!option_bool(OPT_FQDN_UPDATE) && !(fqdn_flags & 0x01))
fqdn_flags |= 0x03;
fqdn_flags &= ~0x08;
fqdn_flags |= 0x01;
if (fqdn_flags & 0x04)
while (*op != 0 && ((op + (*op) + 1) - pp) < len)
@@ -1190,7 +1189,7 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
else if (!lease)
{
if ((lease = lease_allocate(mess->yiaddr)))
if ((lease = lease_allocate4(mess->yiaddr)))
do_classes = 1;
else
message = _("no leases left");