From f98c12b9f04ef3a9daec822c210044095b41a0ac Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 20 Mar 2021 12:33:34 -0700 Subject: [PATCH] srvrec: Keep support for older resolver Some C libraries e.g. musl do not implement the new res_n* APIs therefore keep the old implementation as fallback and check __RES version macro to determine the API level Upstream-Status: Submitted [https://github.com/Debian/apt/pull/129] Signed-off-by: Khem Raj Cc: Julian Andres Klode --- apt-pkg/contrib/srvrec.cc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/apt-pkg/contrib/srvrec.cc b/apt-pkg/contrib/srvrec.cc index 4ca208273..3eb5f1d4c 100644 --- a/apt-pkg/contrib/srvrec.cc +++ b/apt-pkg/contrib/srvrec.cc @@ -62,6 +62,7 @@ bool GetSrvRecords(std::string name, std::vector &Result) unsigned char answer[PACKETSZ]; int answer_len, compressed_name_len; int answer_count; +#if __RES >= 19991006 struct __res_state res; if (res_ninit(&res) != 0) @@ -71,6 +72,12 @@ bool GetSrvRecords(std::string name, std::vector &Result) std::shared_ptr guard(&res, res_nclose); answer_len = res_nquery(&res, name.c_str(), C_IN, T_SRV, answer, sizeof(answer)); +#else + if (res_init() != 0) + return _error->Errno("res_init", "Failed to init resolver"); + + answer_len = res_query(name.c_str(), C_IN, T_SRV, answer, sizeof(answer)); +#endif //__RES >= 19991006 if (answer_len == -1) return false; if (answer_len < (int)sizeof(HEADER)) -- 2.31.0