mirror of
https://sourceware.org/git/glibc.git
synced 2025-08-08 17:42:12 +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:
@@ -1,4 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
|
||||
* Copyright (c) 1996,1999 by Internet Software Consortium.
|
||||
*
|
||||
* Permission to use, copy, modify, and distribute this software for any
|
||||
@@ -88,8 +89,8 @@ ns_format_ttl(u_long src, char *dst, size_t dstlen) {
|
||||
|
||||
return (dst - odst);
|
||||
}
|
||||
libresolv_hidden_def (ns_format_ttl)
|
||||
|
||||
#ifndef SHARED
|
||||
// Seems not to be needed. It's not exported from the DSO. Some libresolv.a
|
||||
// might depend on it so we let it in.
|
||||
int
|
||||
@@ -132,7 +133,8 @@ ns_parse_ttl(const char *src, u_long *dst) {
|
||||
goto einval;
|
||||
else
|
||||
ttl += tmp;
|
||||
}
|
||||
} else if (!dirty)
|
||||
goto einval;
|
||||
*dst = ttl;
|
||||
return (0);
|
||||
|
||||
@@ -140,7 +142,6 @@ ns_parse_ttl(const char *src, u_long *dst) {
|
||||
__set_errno (EINVAL);
|
||||
return (-1);
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Private. */
|
||||
|
||||
@@ -157,3 +158,5 @@ fmt1(int t, char s, char **buf, size_t *buflen) {
|
||||
*buflen -= len;
|
||||
return (0);
|
||||
}
|
||||
|
||||
/*! \file */
|
||||
|
Reference in New Issue
Block a user