mirror of
https://sourceware.org/git/glibc.git
synced 2025-12-24 17:51:17 +03:00
* Versions.def: Add GLIBC_2.9 to libresolv.
* include/resolv.h: Remove hidden proto declarations for __ns_* functions. Add them for __dn_count_labels and __p_secstodate. * include/arpa/nameser.h: Add a number of hidden proto declarations. Define ns_msg_getflags macro here. * resolv/res_debug.c: Add hidden definition for __dn_count_labels and __p_secstodate. * resolv/Versions: Export functions from <arpa/nameser.h> from libresolv in version GLIBC_2.9. * resolv/ns_name.c: Integrate changes from bind 9.5.0. Add necessary hidden definitions. * resolv/ns_netint.c: Likewise. * resolv/ns_parse.c: Likewise. * resolv/ns_print.c: Likewise. * resolv/ns_samedomain.c: Likewise. * resolv/ns_ttl.c: Likewise. * resolv/arpa/nameser_compat.h: Likewise. * resolv/arpa/nameser.h: Likewise. Remove macros which redirect function calls. * resolv/nss_dns/dns-canon.c (_nss_dns_getcanonname_r): Use __ns_get16 instead of ns_get16. * resolv/nss_dns/dns-host.c (getanswer_r): Use __ns_get16 and __ns_get32 instead of ns_get16 and ns_get32 respectively. (gaih_getanswer_slice): Likewise. * resolv/Makefile (libresolv-routines): Add ns_date. * resolv/ns_date.c: New file.
This commit is contained in:
@@ -698,13 +698,13 @@ getanswer_r (const querybuf *answer, int anslen, const char *qname, int qtype,
|
||||
continue;
|
||||
}
|
||||
|
||||
type = ns_get16 (cp);
|
||||
type = __ns_get16 (cp);
|
||||
cp += INT16SZ; /* type */
|
||||
class = ns_get16 (cp);
|
||||
class = __ns_get16 (cp);
|
||||
cp += INT16SZ; /* class */
|
||||
ttl = ns_get32 (cp);
|
||||
ttl = __ns_get32 (cp);
|
||||
cp += INT32SZ; /* TTL */
|
||||
n = ns_get16 (cp);
|
||||
n = __ns_get16 (cp);
|
||||
cp += INT16SZ; /* len */
|
||||
if (__builtin_expect (class != C_IN, 0))
|
||||
{
|
||||
@@ -1032,13 +1032,13 @@ gaih_getanswer_slice (const querybuf *answer, int anslen, const char *qname,
|
||||
continue;
|
||||
}
|
||||
|
||||
int type = ns_get16 (cp);
|
||||
int type = __ns_get16 (cp);
|
||||
cp += INT16SZ; /* type */
|
||||
int class = ns_get16 (cp);
|
||||
int class = __ns_get16 (cp);
|
||||
cp += INT16SZ; /* class */
|
||||
int32_t ttl = ns_get32 (cp);
|
||||
int32_t ttl = __ns_get32 (cp);
|
||||
cp += INT32SZ; /* TTL */
|
||||
n = ns_get16 (cp);
|
||||
n = __ns_get16 (cp);
|
||||
cp += INT16SZ; /* len */
|
||||
|
||||
if (class != C_IN)
|
||||
|
||||
Reference in New Issue
Block a user