diff options
| -rw-r--r-- | lib/tevent/tevent.mk | 3 | ||||
| -rw-r--r-- | source4/libcli/resolve/dns_ex.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/tevent/tevent.mk b/lib/tevent/tevent.mk index b3a6608b99..8b4c6ed27e 100644 --- a/lib/tevent/tevent.mk +++ b/lib/tevent/tevent.mk @@ -48,6 +48,5 @@ tevent.$(SHLIBEXT): libtevent.$(SHLIBEXT) pytevent.o install-python:: build-python mkdir -p $(DESTDIR)`$(PYTHON) -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(0, prefix='$(prefix)')"` \ $(DESTDIR)`$(PYTHON) -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1, prefix='$(prefix)')"` - cp $(teventdir)/events.py $(DESTDIR)`$(PYTHON) -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(0, prefix='$(prefix)')"` - cp _libevents.$(SHLIBEXT) $(DESTDIR)`$(PYTHON) -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1, prefix='$(prefix)')"` + cp tevent.$(SHLIBEXT) $(DESTDIR)`$(PYTHON) -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1, prefix='$(prefix)')"` diff --git a/source4/libcli/resolve/dns_ex.c b/source4/libcli/resolve/dns_ex.c index 948ad9f134..17e7aad290 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; |