[Dnsmasq-discuss] [PATCH] option.c: fix NO_DHCP6 build error

Simon Kelley simon at thekelleys.org.uk
Mon Mar 2 18:14:22 GMT 2020


Opps. Patch applied.



Cheers,

Simon.


On 02/03/2020 10:00, Kevin Darbyshire-Bryant wrote:
> Errors encountered if building with 'NO_DHCP6' introduced by
> commit 137286e9baecf6a3ba97722ef1b49c851b531810
> 
> option.c: In function 'dhcp_config_free':
> option.c:1040:24: error: 'struct dhcp_config' has no member named 'addr6'; did you mean 'addr'?
>     for (addr = config->addr6; addr; addr = tmp)
>                         ^~~~~
>                         addr
> option.c: In function 'one_opt':
> option.c:3227:7: error: 'struct dhcp_config' has no member named 'addr6'; did you mean 'addr'?
>   new->addr6 = NULL;
>        ^~~~~
>        addr
> 
> Wrap new code in ifdef HAVE_DHCP6
> 
> Signed-off-by: Kevin Darbyshire-Bryant <ldir at darbyshire-bryant.me.uk>
> ---
>  src/option.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/src/option.c b/src/option.c
> index 6e8bb8b..f8ba616 100644
> --- a/src/option.c
> +++ b/src/option.c
> @@ -1036,6 +1036,7 @@ static void dhcp_config_free(struct dhcp_config *config)
>        if (config->flags & CONFIG_CLID)
>          free(config->clid);
>  
> +#ifdef HAVE_DHCP6
>        if (config->flags & CONFIG_ADDR6)
>  	{
>  	  struct addrlist *addr, *tmp;
> @@ -1046,6 +1047,7 @@ static void dhcp_config_free(struct dhcp_config *config)
>  	      free(addr);
>  	    }
>  	}
> +#endif
>  
>        free(config);
>      }
> @@ -3227,7 +3229,9 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
>  	new->netid = NULL;
>  	new->filter = NULL;
>  	new->clid = NULL;
> +#ifdef HAVE_DHCP6
>  	new->addr6 = NULL;
> +#endif
>  
>  	while (arg)
>  	  {
> 
O



More information about the Dnsmasq-discuss mailing list