mirror of
https://sourceware.org/git/glibc.git
synced 2024-09-20 00:19:57 +00:00
176804300b
conform/ namespace tests of arpa/inet.h, netdb.h and netinet/in.h fail for UNIX98 and XPG42 because of inclusion of stdint.h, which defines macros not permitted in those headers for those standards. UNIX98 allows them to include inttypes.h, but (predating C99) has restricted inttypes.h contents (not yet tested in the conform/ tests) not including those macros; XPG4.2 has no such permission and no inttypes.h / stdint.h at all. This patch rearranges the headers to avoid this issue. intN_t definitions move to bits/stdint-intn.h, and uintN_t definitions to bits/stdint-uintn.h. (These are not bits/types/ headers because they each define four types. They are separate rather than just a single header because sys/types.h defines intN_t but u_intN_t rather than uintN_t - and while sys/types.h could define uintN_t because of the POSIX reservation of *_t, existing practice there is largely to condition types on appropriate feature test macros, and indeed there is at least one open bug report (14553) about a type that's not so-conditioned, so maybe types there should actually have conditions added where appropriate.) The affected network headers are then made to include bits/stdint-uintn.h instead of stdint.h. This allows six XFAILs to be removed. This doesn't do anything about inttypes.h defining more than it should for UNIX98, but we don't have conformtest expectations for that case at present (and my inclination is that a fix for that should be as local as possible - affecting only inttypes.h, not stdint.h, only for the case of __USE_UNIX98 && !__USE_ISOC99). Tested for x86_64. [BZ #21455] * bits/stdint-intn.h: New file. * bits/stdint-uintn.h: Likewise. * stdlib/Makefile (headers): Add bits/stdint-intn.h and bits/stdint-uintn.h. * inet/netinet/in.h: Include <bits/stdint-uintn.h> instead of <stdint.h>. * posix/sys/types.h: Include <bits/stdint-intn.h>. (__int8_t_defined): Do not define here. (int8_t): Likewise. (int16_t): Likewise. (int32_t): Likewise. (int64_t): Likewise. [__GNUC_PREREQ (2, 7)] (__intN_t): Likewise. * resolv/netdb.h: Include <bits/stdint-uintn.h> instead of <stdint.h>. * include/netdb.h [_ISOMAC]: Do not include <stdint.h>. * sysdeps/generic/stdint.h: Include <bits/stdint-intn.h> and <bits/stdint-uintn.h>. (int8_t): Do not define here. (int16_t): Likewise. (int32_t): Likewise. (int64_t): Likewise. (uint8_t): Likewise. (uint16_t): Likewise. (uint32_t): Likewise. (uint64_t): Likewise. * conform/Makefile (test-xfail-XPG42/arpa/inet.h/conform): Remove variable. (test-xfail-XPG42/netdb.h/conform): Likewise. (test-xfail-XPG42/netinet/in.h/conform): Likewise. (test-xfail-UNIX98/arpa/inet.h/conform): Likewise. (test-xfail-UNIX98/netdb.h/conform): Likewise. (test-xfail-UNIX98/netinet/in.h/conform): Likewise.
285 lines
12 KiB
C
285 lines
12 KiB
C
#ifndef _NETDB_H
|
|
#include <resolv/netdb.h>
|
|
|
|
#ifndef _ISOMAC
|
|
# include <stdint.h>
|
|
/* Macros for accessing h_errno from inside libc. */
|
|
# if IS_IN_LIB
|
|
# undef h_errno
|
|
# if IS_IN (libc)
|
|
# define h_errno __libc_h_errno
|
|
# else
|
|
# define h_errno __h_errno
|
|
# endif
|
|
extern __thread int h_errno attribute_tls_model_ie;
|
|
# endif /* IS_IN_LIB */
|
|
# define __set_h_errno(x) (h_errno = (x))
|
|
|
|
libc_hidden_proto (hstrerror)
|
|
libc_hidden_proto (innetgr)
|
|
libc_hidden_proto (rcmd_af)
|
|
libc_hidden_proto (rexec_af)
|
|
libc_hidden_proto (rresvport_af)
|
|
libc_hidden_proto (ruserok_af)
|
|
|
|
libc_hidden_proto (getaddrinfo)
|
|
libc_hidden_proto (getnameinfo)
|
|
libc_hidden_proto (freeaddrinfo)
|
|
libc_hidden_proto (gai_strerror)
|
|
libc_hidden_proto (__h_errno_location)
|
|
|
|
/* Document internal interfaces. */
|
|
extern int __gethostent_r (struct hostent *__restrict __result_buf,
|
|
char *__restrict __buf, size_t __buflen,
|
|
struct hostent **__restrict __result,
|
|
int *__restrict __h_errnop) attribute_hidden;
|
|
extern int __old_gethostent_r (struct hostent *__restrict __result_buf,
|
|
char *__restrict __buf, size_t __buflen,
|
|
struct hostent **__restrict __result,
|
|
int *__restrict __h_errnop);
|
|
|
|
extern int __gethostbyaddr_r (const void *__restrict __addr,
|
|
socklen_t __len, int __type,
|
|
struct hostent *__restrict __result_buf,
|
|
char *__restrict __buf, size_t __buflen,
|
|
struct hostent **__restrict __result,
|
|
int *__restrict __h_errnop);
|
|
extern int __old_gethostbyaddr_r (const void *__restrict __addr,
|
|
socklen_t __len, int __type,
|
|
struct hostent *__restrict __result_buf,
|
|
char *__restrict __buf, size_t __buflen,
|
|
struct hostent **__restrict __result,
|
|
int *__restrict __h_errnop);
|
|
|
|
extern int __gethostbyaddr2_r (const void *__restrict __addr,
|
|
socklen_t __len, int __type,
|
|
struct hostent *__restrict __result_buf,
|
|
char *__restrict __buf, size_t __buflen,
|
|
struct hostent **__restrict __result,
|
|
int *__restrict __h_errnop,
|
|
int32_t *ttlp);
|
|
|
|
extern int __gethostbyname_r (const char *__restrict __name,
|
|
struct hostent *__restrict __result_buf,
|
|
char *__restrict __buf, size_t __buflen,
|
|
struct hostent **__restrict __result,
|
|
int *__restrict __h_errnop);
|
|
extern int __old_gethostbyname_r (const char *__restrict __name,
|
|
struct hostent *__restrict __result_buf,
|
|
char *__restrict __buf, size_t __buflen,
|
|
struct hostent **__restrict __result,
|
|
int *__restrict __h_errnop);
|
|
|
|
extern int __gethostbyname2_r (const char *__restrict __name, int __af,
|
|
struct hostent *__restrict __result_buf,
|
|
char *__restrict __buf, size_t __buflen,
|
|
struct hostent **__restrict __result,
|
|
int *__restrict __h_errnop);
|
|
extern int __old_gethostbyname2_r (const char *__restrict __name, int __af,
|
|
struct hostent *__restrict __result_buf,
|
|
char *__restrict __buf, size_t __buflen,
|
|
struct hostent **__restrict __result,
|
|
int *__restrict __h_errnop);
|
|
|
|
extern int __gethostbyname3_r (const char *__restrict __name, int __af,
|
|
struct hostent *__restrict __result_buf,
|
|
char *__restrict __buf, size_t __buflen,
|
|
struct hostent **__restrict __result,
|
|
int *__restrict __h_errnop,
|
|
int32_t *ttlp, char **canonp);
|
|
|
|
extern int __getnetent_r (struct netent *__restrict __result_buf,
|
|
char *__restrict __buf, size_t __buflen,
|
|
struct netent **__restrict __result,
|
|
int *__restrict __h_errnop) attribute_hidden;
|
|
extern int __old_getnetent_r (struct netent *__restrict __result_buf,
|
|
char *__restrict __buf, size_t __buflen,
|
|
struct netent **__restrict __result,
|
|
int *__restrict __h_errnop);
|
|
|
|
extern int __getnetbyaddr_r (uint32_t __net, int __type,
|
|
struct netent *__restrict __result_buf,
|
|
char *__restrict __buf, size_t __buflen,
|
|
struct netent **__restrict __result,
|
|
int *__restrict __h_errnop);
|
|
extern int __old_getnetbyaddr_r (uint32_t __net, int __type,
|
|
struct netent *__restrict __result_buf,
|
|
char *__restrict __buf, size_t __buflen,
|
|
struct netent **__restrict __result,
|
|
int *__restrict __h_errnop);
|
|
|
|
extern int __getnetbyname_r (const char *__restrict __name,
|
|
struct netent *__restrict __result_buf,
|
|
char *__restrict __buf, size_t __buflen,
|
|
struct netent **__restrict __result,
|
|
int *__restrict __h_errnop);
|
|
extern int __old_getnetbyname_r (const char *__restrict __name,
|
|
struct netent *__restrict __result_buf,
|
|
char *__restrict __buf, size_t __buflen,
|
|
struct netent **__restrict __result,
|
|
int *__restrict __h_errnop);
|
|
|
|
extern int __getservent_r (struct servent *__restrict __result_buf,
|
|
char *__restrict __buf, size_t __buflen,
|
|
struct servent **__restrict __result)
|
|
attribute_hidden;
|
|
extern int __old_getservent_r (struct servent *__restrict __result_buf,
|
|
char *__restrict __buf, size_t __buflen,
|
|
struct servent **__restrict __result);
|
|
|
|
extern int __getservbyname_r (const char *__restrict __name,
|
|
const char *__restrict __proto,
|
|
struct servent *__restrict __result_buf,
|
|
char *__restrict __buf, size_t __buflen,
|
|
struct servent **__restrict __result);
|
|
extern int __old_getservbyname_r (const char *__restrict __name,
|
|
const char *__restrict __proto,
|
|
struct servent *__restrict __result_buf,
|
|
char *__restrict __buf, size_t __buflen,
|
|
struct servent **__restrict __result);
|
|
|
|
extern int __getservbyport_r (int __port,
|
|
const char *__restrict __proto,
|
|
struct servent *__restrict __result_buf,
|
|
char *__restrict __buf, size_t __buflen,
|
|
struct servent **__restrict __result);
|
|
extern int __old_getservbyport_r (int __port,
|
|
const char *__restrict __proto,
|
|
struct servent *__restrict __result_buf,
|
|
char *__restrict __buf, size_t __buflen,
|
|
struct servent **__restrict __result);
|
|
|
|
extern int __getprotoent_r (struct protoent *__restrict __result_buf,
|
|
char *__restrict __buf, size_t __buflen,
|
|
struct protoent **__restrict __result)
|
|
attribute_hidden;
|
|
extern int __old_getprotoent_r (struct protoent *__restrict __result_buf,
|
|
char *__restrict __buf, size_t __buflen,
|
|
struct protoent **__restrict __result);
|
|
|
|
extern int __getprotobyname_r (const char *__restrict __name,
|
|
struct protoent *__restrict __result_buf,
|
|
char *__restrict __buf, size_t __buflen,
|
|
struct protoent **__restrict __result);
|
|
extern int __old_getprotobyname_r (const char *__restrict __name,
|
|
struct protoent *__restrict __result_buf,
|
|
char *__restrict __buf, size_t __buflen,
|
|
struct protoent **__restrict __result);
|
|
|
|
extern int __getprotobynumber_r (int __proto,
|
|
struct protoent *__restrict __res_buf,
|
|
char *__restrict __buf, size_t __buflen,
|
|
struct protoent **__restrict __result);
|
|
extern int __old_getprotobynumber_r (int __proto,
|
|
struct protoent *__restrict __res_buf,
|
|
char *__restrict __buf, size_t __buflen,
|
|
struct protoent **__restrict __result);
|
|
|
|
extern int __getnetgrent_r (char **__restrict __hostp,
|
|
char **__restrict __userp,
|
|
char **__restrict __domainp,
|
|
char *__restrict __buffer, size_t __buflen);
|
|
|
|
extern int ruserpass (const char *host, const char **aname,
|
|
const char **apass);
|
|
libc_hidden_proto (ruserpass)
|
|
|
|
|
|
/* The following definition has been removed from the public header
|
|
since we don't want people to use them. */
|
|
|
|
#define AI_DEFAULT (AI_V4MAPPED | AI_ADDRCONFIG)
|
|
|
|
#include <inet/netgroup.h>
|
|
|
|
struct parser_data;
|
|
extern int _nss_files_parse_protoent (char *line, struct protoent *result,
|
|
struct parser_data *data,
|
|
size_t datalen, int *errnop);
|
|
extern int _nss_files_parse_servent (char *line, struct servent *result,
|
|
struct parser_data *data,
|
|
size_t datalen, int *errnop);
|
|
extern int _nss_files_parse_netent (char *line, struct netent *result,
|
|
struct parser_data *data,
|
|
size_t datalen, int *errnop);
|
|
extern enum nss_status _nss_netgroup_parseline (char **cursor,
|
|
struct __netgrent *result,
|
|
char *buffer, size_t buflen,
|
|
int *errnop);
|
|
libnss_files_hidden_proto (_nss_files_parse_protoent)
|
|
libnss_files_hidden_proto (_nss_files_parse_servent)
|
|
libnss_files_hidden_proto (_nss_files_parse_netent)
|
|
libnss_files_hidden_proto (_nss_netgroup_parseline)
|
|
|
|
#define DECLARE_NSS_PROTOTYPES(service) \
|
|
extern enum nss_status _nss_ ## service ## _setprotoent (int); \
|
|
extern enum nss_status _nss_ ## service ## _endprotoent (void); \
|
|
extern enum nss_status _nss_ ## service ## _getprotoent_r \
|
|
(struct protoent *proto, char *buffer, size_t buflen, \
|
|
int *errnop); \
|
|
extern enum nss_status _nss_ ## service ## _getprotobyname_r \
|
|
(const char *name, struct protoent *proto, \
|
|
char *buffer, size_t buflen, int *errnop); \
|
|
extern enum nss_status _nss_ ## service ## _getprotobynumber_r \
|
|
(int number, struct protoent *proto, \
|
|
char *buffer, size_t buflen, int *errnop); \
|
|
extern enum nss_status _nss_ ## service ## _sethostent (int); \
|
|
extern enum nss_status _nss_ ## service ## _endhostent (void); \
|
|
extern enum nss_status _nss_ ## service ## _gethostent_r \
|
|
(struct hostent *host, char *buffer, size_t buflen, \
|
|
int *errnop, int *h_errnop); \
|
|
extern enum nss_status _nss_ ## service ## _gethostbyname2_r \
|
|
(const char *name, int af, struct hostent *host, \
|
|
char *buffer, size_t buflen, int *errnop, \
|
|
int *h_errnop); \
|
|
extern enum nss_status _nss_ ## service ## _gethostbyname_r \
|
|
(const char *name, struct hostent *host, char *buffer, \
|
|
size_t buflen, int *errnop, int *h_errnop); \
|
|
extern enum nss_status _nss_ ## service ## _gethostbyaddr_r \
|
|
(const void *addr, socklen_t addrlen, int af, \
|
|
struct hostent *host, char *buffer, size_t buflen, \
|
|
int *errnop, int *h_errnop); \
|
|
extern enum nss_status _nss_ ## service ## _setservent (int); \
|
|
extern enum nss_status _nss_ ## service ## _endservent (void); \
|
|
extern enum nss_status _nss_ ## service ## _getservent_r \
|
|
(struct servent *serv, char *buffer, size_t buflen, \
|
|
int *errnop); \
|
|
extern enum nss_status _nss_ ## service ## _getservbyname_r \
|
|
(const char *name, const char *protocol, \
|
|
struct servent *serv, char *buffer, size_t buflen, \
|
|
int *errnop); \
|
|
extern enum nss_status _nss_ ## service ## _getservbyport_r \
|
|
(int port, const char *protocol, struct servent *serv, \
|
|
char *buffer, size_t buflen, int *errnop); \
|
|
extern enum nss_status _nss_ ## service ## _setnetgrent \
|
|
(const char *group, struct __netgrent *result); \
|
|
extern enum nss_status _nss_ ## service ## _endnetgrent \
|
|
(struct __netgrent *result); \
|
|
extern enum nss_status _nss_ ## service ## _getnetgrent_r \
|
|
(struct __netgrent *result, char *buffer, \
|
|
size_t buflen, int *errnop); \
|
|
extern enum nss_status _nss_ ## service ## _setnetent (int stayopen); \
|
|
extern enum nss_status _nss_ ## service ## _endnetent (void); \
|
|
extern enum nss_status _nss_ ## service ## _getnetent_r \
|
|
(struct netent *net, char *buffer, size_t buflen, \
|
|
int *errnop, int *herrnop); \
|
|
extern enum nss_status _nss_ ## service ## _getnetbyname_r \
|
|
(const char *name, struct netent *net, char *buffer, \
|
|
size_t buflen, int *errnop, int *herrnop); \
|
|
extern enum nss_status _nss_ ## service ## _getnetbyaddr_r \
|
|
(uint32_t addr, int type, struct netent *net, \
|
|
char *buffer, size_t buflen, int *errnop, \
|
|
int *herrnop);
|
|
|
|
DECLARE_NSS_PROTOTYPES (compat)
|
|
DECLARE_NSS_PROTOTYPES (dns)
|
|
DECLARE_NSS_PROTOTYPES (files)
|
|
DECLARE_NSS_PROTOTYPES (hesiod)
|
|
DECLARE_NSS_PROTOTYPES (nis)
|
|
DECLARE_NSS_PROTOTYPES (nisplus)
|
|
|
|
#undef DECLARE_NSS_PROTOTYPES
|
|
#endif
|
|
|
|
#endif /* !_NETDB_H */
|