Update to FreeBSD stable/12 2019-06-05

Git mirror commit 78576620f2689e23144a1cf1bf55106cc6abe2b7.
This commit is contained in:
Sebastian Huber
2019-06-05 11:35:39 +02:00
parent 8f12ed3824
commit 705e362ea5
368 changed files with 34728 additions and 7606 deletions

View File

@@ -239,6 +239,7 @@ enum {
INTERPOS_map_stacks_exec,
INTERPOS_fdatasync,
INTERPOS_clock_nanosleep,
INTERPOS_distribute_static_tls,
INTERPOS_MAX
};
@@ -417,6 +418,8 @@ struct dl_phdr_info;
int __elf_phdr_match_addr(struct dl_phdr_info *, void *);
void __init_elf_aux_vector(void);
void __libc_map_stacks_exec(void);
void __libc_distribute_static_tls(__size_t, void *, __size_t, __size_t);
__uintptr_t __libc_static_tls_base(__size_t);
void _pthread_cancel_enter(int);
void _pthread_cancel_leave(int);

View File

@@ -226,10 +226,8 @@ getnameinfo_inet(const struct afd *afd,
case AF_INET:
v4a = (u_int32_t)
ntohl(((const struct sockaddr_in *)sa)->sin_addr.s_addr);
if (IN_MULTICAST(v4a) || IN_EXPERIMENTAL(v4a))
flags |= NI_NUMERICHOST;
v4a >>= IN_CLASSA_NSHIFT;
if (v4a == 0)
if (IN_MULTICAST(v4a) || IN_EXPERIMENTAL(v4a) ||
IN_ZERONET(v4a))
flags |= NI_NUMERICHOST;
break;
#ifdef INET6