diff options
| author |   florian <florian@openbsd.org> | 2020-01-09 13:45:33 +0000 |
|---|---|---|
| committer | florian <florian@openbsd.org> | 2020-01-09 13:45:33 +0000 |
| commit | 3d11ce0c9019bf0eb8ee99f5a9b088fc6febe363 (patch) | |
| tree | d7ed8d04fb3e623e5b0154f396089b9933cee0ac /usr.sbin/bind/lib/isc/unix/entropy.c | |
| parent | Move peer related code from rde.c to rde_peer.c. (diff) | |
| download | wireguard-openbsd-3d11ce0c9019bf0eb8ee99f5a9b088fc6febe363.tar.xz wireguard-openbsd-3d11ce0c9019bf0eb8ee99f5a9b088fc6febe363.zip | |
unifdef network defines:
#define ISC_PLATFORM_HAVESALEN 1
#define ISC_PLATFORM_HAVEIPV6 1
#undef ISC_PLATFORM_NEEDIN6ADDRANY
#undef ISC_PLATFORM_NEEDIN6ADDRLOOPBACK
#define ISC_PLATFORM_HAVEIN6PKTINFO 1
#undef ISC_PLATFORM_HAVEINADDR6
#define ISC_PLATFORM_HAVESCOPEID 1
#undef ISC_PLATFORM_NEEDNTOP
#undef ISC_PLATFORM_NEEDPTON
#undef ISC_PLATFORM_NEEDPORTT
#undef ISC_PLATFORM_HAVELIFCONF
#undef ISC_PLATFORM_HAVEIF_LADDRCONF
#undef ISC_PLATFORM_HAVEIF_LADDRREQ
#define ISC_NET_BSD44MSGHDR 1
#define ISC_PLATFORM_HAVEIFNAMETOINDEX 1
#undef ISC_PLATFORM_FIXIN6ISADDR
#define ISC_PLATFORM_HAVESOCKADDRSTORAGE 1
#define ISC_PLATFORM_HAVEKQUEUE 1
#undef ISC_PLATFORM_HAVEEPOLL
#undef ISC_PLATFORM_HAVEDEVPOLL
prodding deraadt@
Diffstat (limited to 'usr.sbin/bind/lib/isc/unix/entropy.c')
| -rw-r--r-- | usr.sbin/bind/lib/isc/unix/entropy.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/usr.sbin/bind/lib/isc/unix/entropy.c b/usr.sbin/bind/lib/isc/unix/entropy.c index 95466a86cec..8788c7c3db3 100644 --- a/usr.sbin/bind/lib/isc/unix/entropy.c +++ b/usr.sbin/bind/lib/isc/unix/entropy.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: entropy.c,v 1.8 2019/12/17 01:46:37 sthen Exp $ */ +/* $Id: entropy.c,v 1.9 2020/01/09 13:45:33 florian Exp $ */ /* \file unix/entropy.c * \brief @@ -541,13 +541,11 @@ isc_entropy_createfilesource(isc_entropy_t *ent, const char *fname) { memset(&sname, 0, sizeof(sname)); sname.sun_family = AF_UNIX; strlcpy(sname.sun_path, fname, sizeof(sname.sun_path)); -#ifdef ISC_PLATFORM_HAVESALEN #if !defined(SUN_LEN) #define SUN_LEN(su) \ (sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path)) #endif sname.sun_len = SUN_LEN(&sname); -#endif if (connect(fd, (struct sockaddr *) &sname, sizeof(struct sockaddr_un)) < 0) { |