dns.idl ==> build breaks on non-ipv6 systems

[Michael Adam]

Hi Kai,

Kai Blin wrote:
> On 2010-11-07 09:58, Kai Blin wrote:
> 
> Hi Michael,
> 
> >> it seems the introduction of the dns server in s4
> >> has broken the build on non-ipv6 systems by using
> >> AD_INET6 unconditionally in the pull/push/print_ipv6
> >> functions in ndr_basic.c
> > 
> > It's not directly related to the dns server, but I agree I did forget to
> > put some IPv6 #ifdef around it. In fact, I also got a couple of things
> > wrong that David pointed out. I'll go and properly fix this.
> 
> In the meantime, I think the attached patch should fix the build on your
> non-IPv6 hosts.

It does. I started off with precisely the same
patch, but I was not certain about the impact on the
s4 dns server, so I chose to suggest the moving.
But if you are ok with this patch, then of course
so am I.

Cheers - Michael

> Cheers,
> Kai
> 
> -- 
> Kai Blin
> Worldforge developer http://www.worldforge.org/
> Wine developer http://wiki.winehq.org/KaiBlin
> Samba team member http://www.samba.org/samba/team/

> >From 88629e0fe319faf160734070fda4f6fec4924cb2 Mon Sep 17 00:00:00 2001
> From: Kai Blin <kai at samba.org>
> Date: Sun, 7 Nov 2010 10:12:01 +0100
> Subject: [PATCH] ndr: Fix ndr_basic.c build for non-IPv6 systems
> 
> ---
>  librpc/ndr/ndr_basic.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/librpc/ndr/ndr_basic.c b/librpc/ndr/ndr_basic.c
> index 31a8b9d..750144f 100644
> --- a/librpc/ndr/ndr_basic.c
> +++ b/librpc/ndr/ndr_basic.c
> @@ -848,6 +848,7 @@ _PUBLIC_ void ndr_print_ipv4address(struct ndr_print *ndr, const char *name,
>  	ndr->print(ndr, "%-25s: %s", name, address);
>  }
>  
> +#ifdef HAVE_IPV6
>  /*
>    pull a ipv6address
>  */
> @@ -903,6 +904,7 @@ _PUBLIC_ void ndr_print_ipv6address(struct ndr_print *ndr, const char *name,
>  	ndr->print(ndr, "%-25s: %s", name, address);
>  }
>  #undef IPV6_BYTES
> +#endif /*HAVE_IPV6*/
>  
>  _PUBLIC_ void ndr_print_struct(struct ndr_print *ndr, const char *name, const char *type)
>  {
> -- 
> 1.7.0.4
> 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 206 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20101107/b607d709/attachment.pgp>