diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2021-05-05 12:14:11 +0200 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2021-05-05 12:14:11 +0200 |
| commit | 6fe716703b2dd5c47cb6684e0b83fd1c52516d41 (patch) | |
| tree | 48a43023f193d0a93afafbd58e531638a6c70aab | |
| parent | 51b5ed32738c8828c7049bb8024cda23f32dd6c9 (diff) | |
| parent | f98c12b9f04ef3a9daec822c210044095b41a0ac (diff) | |
Merge branch 'master' of https://github.com/kraj/apt
See https://github.com/Debian/apt/pull/129
| -rw-r--r-- | apt-pkg/contrib/srvrec.cc | 7 |
1 files changed, 7 insertions, 0 deletions
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<SrvRec> &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<SrvRec> &Result) std::shared_ptr<void> 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)) |