[SCM] Samba Shared Repository - branch master updated- 50feca550eed7828198b7c0fc5f0e5ddc863313d

[Tim Prouty]

On Dec 24, 2008, at 4:41 AM, Stefan (metze) Metzmacher wrote:

> Hi Tim,
>
>> diff --git a/source4/libcli/resolve/dns_ex.c b/source4/libcli/ 
>> resolve/dns_ex.c
>> index 948ad9f..17e7aad 100644
>> --- a/source4/libcli/resolve/dns_ex.c
>> +++ b/source4/libcli/resolve/dns_ex.c
>> @@ -278,7 +278,11 @@ static void run_child_getaddrinfo(struct  
>> dns_ex_state *state, int fd)
>> 	hints.ai_flags = AI_ADDRCONFIG | AI_NUMERICSERV;
>>
>> 	ret = getaddrinfo(state->name.name, "0", &hints, &res_list);
>> +#if defined(EAI_NODATA) && (EAI_NODATA != EAI_NONAME)
>
> why such a complex logic? just '#ifdef EAI_NODATA' would do the  
> same...
>
>> 	if (ret == EAI_NODATA && state->do_fallback) {
>> +#else
>> +	if (ret == EAI_NONAME && state->do_fallback) {
>> +#endif


Agreed.  I'll push a simplified version this afternoon.

-Tim