7541d30c9c
f52bb5b fix previous commit 18eac67 Fix entries in /etc/hosts disabling static leases. f8c77ed Fix removal of DHCP_CLIENT_MAC options from DHCPv6 relay replies. 4bf62f6 Tidy cache_blockdata_free() 9c0d445 Fix e7bfd556c079c8b5e7425aed44abc35925b24043 to actually work. 2896e24 Check for not(DS or DNSKEY) in is_outdated_cname_pointer() a90f09d Fix crash freeing negative SRV cache entries. 5b99eae Cache SRV records. 2daca52 Fix typo in ra-param man page section. 2c59473 File logic bug in cache-marshalling code. Introduced a couple of commits back. cc921df Remove nested struct/union in cache records and all_addr. ab194ed Futher address union tidying. 65a01b7 Tidy address-union handling: move class into explicit argument. bde4647 Tidy all_addr union, merge log and rcode fields. e7bfd55 Alter DHCP address selection after DECLINE in consec-addr mode. Avoid offering the same address after a recieving a DECLINE message to stop an infinite protocol loop. This has long been done in default address allocation mode: this adds similar behaviour when allocaing addresses consecutively. The most relevant fix for openwrt is 18eac67 (& my own local f52bb5b which fixes a missing bracket silly) To quote the patch: It is possible for a config entry to have one address family specified by a dhcp-host directive and the other added from /etc/hosts. This is especially common on OpenWrt because it uses odhcpd for DHCPv6 and IPv6 leases are imported into dnsmasq via a hosts file. To handle this case there need to be separate *_HOSTS flags for IPv4 and IPv6. Otherwise when the hosts file is reloaded it will clear the CONFIG_ADDR(6) flag which was set by the dhcp-host directive. Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
42 lines
1.1 KiB
Diff
42 lines
1.1 KiB
Diff
From 137e9f878fafb38369eab7d9dfe84e4228ff5f89 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
|
|
Date: Sun, 16 Dec 2018 21:25:29 +0000
|
|
Subject: [PATCH 14/30] Fix option parsing errors introduced in
|
|
59e470381f84f2fdf0640c7bc67827f3f0c64784
|
|
|
|
Thanks to Kevin Darbyshire-Bryant for spotting this.
|
|
|
|
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
|
|
---
|
|
src/option.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
--- a/src/option.c
|
|
+++ b/src/option.c
|
|
@@ -3432,7 +3432,7 @@ static int one_opt(int option, char *arg
|
|
{
|
|
struct dhcp_netid *id = dhcp_tags(&arg);
|
|
|
|
- if (!id)
|
|
+ if (!arg)
|
|
{
|
|
ret_err(gen_err);
|
|
}
|
|
@@ -3483,7 +3483,7 @@ static int one_opt(int option, char *arg
|
|
{
|
|
struct dhcp_netid *id = dhcp_tags(&arg);
|
|
|
|
- if (!id)
|
|
+ if (!arg)
|
|
{
|
|
ret_err(gen_err);
|
|
}
|
|
@@ -3513,7 +3513,7 @@ static int one_opt(int option, char *arg
|
|
new->opt = 10; /* PXE_MENU_PROMPT */
|
|
new->netid = dhcp_tags(&arg);
|
|
|
|
- if (!new->netid)
|
|
+ if (!arg)
|
|
{
|
|
dhcp_opt_free(new);
|
|
ret_err(gen_err);
|