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

[Tim Prouty]

The branch, master has been updated
       via  50feca550eed7828198b7c0fc5f0e5ddc863313d (commit)
      from  e9deb757594bef54f126a6ac4463b86c1eb83099 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 50feca550eed7828198b7c0fc5f0e5ddc863313d
Author: Tim Prouty <tprouty at samba.org>
Date:   Mon Dec 22 15:04:10 2008 -0800

    s4: Fix a getaddrinfo/EAI_NODATA portability issue
    
    FreeBSD has explicitly deprecated EAI_NODATA as a return value from
    getaddrinfo by removing it from netdb.h.  On systems that don't have
    EAI_NODATA, EAI_NONAME should be used instead.

-----------------------------------------------------------------------

Summary of changes:
 source4/libcli/resolve/dns_ex.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

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)
 	if (ret == EAI_NODATA && state->do_fallback) {
+#else
+	if (ret == EAI_NONAME && state->do_fallback) {
+#endif
 		/* getaddrinfo() doesn't handle CNAME records */
 		run_child_dns_lookup(state, fd);
 		return;


-- 
Samba Shared Repository