diff options
| -rw-r--r-- | usr.sbin/bind/bin/dig/dighost.c | 21 | ||||
| -rw-r--r-- | usr.sbin/bind/lib/dns/rdata/in_1/wks_11.c | 4 | ||||
| -rw-r--r-- | usr.sbin/bind/lib/isc/unix/include/isc/netdb.h | 56 |
3 files changed, 9 insertions, 72 deletions
diff --git a/usr.sbin/bind/bin/dig/dighost.c b/usr.sbin/bind/bin/dig/dighost.c index 707246cee9f..5fdbef1048d 100644 --- a/usr.sbin/bind/bin/dig/dighost.c +++ b/usr.sbin/bind/bin/dig/dighost.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dighost.c,v 1.41 2020/01/28 17:17:04 florian Exp $ */ +/* $Id: dighost.c,v 1.42 2020/02/04 19:17:58 florian Exp $ */ /*! \file * \note @@ -26,13 +26,14 @@ * functions in most applications. */ - -#include <stdlib.h> -#include <unistd.h> -#include <string.h> +#include <sys/types.h> +#include <sys/socket.h> #include <limits.h> - #include <locale.h> +#include <netdb.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> #include <dns/byaddr.h> #include <dns/fixedname.h> @@ -54,16 +55,11 @@ #include <isc/app.h> #include <isc/base64.h> - - #include <isc/hex.h> #include <isc/lang.h> #include <isc/log.h> #include <isc/netaddr.h> -#include <isc/netdb.h> #include <isc/parseint.h> - - #include <isc/result.h> #include <isc/safe.h> #include <isc/serial.h> @@ -74,10 +70,7 @@ #include <isc/types.h> #include <isc/util.h> - - #include <isccfg/namedconf.h> - #include <lwres/lwres.h> #include <dig/dig.h> diff --git a/usr.sbin/bind/lib/dns/rdata/in_1/wks_11.c b/usr.sbin/bind/lib/dns/rdata/in_1/wks_11.c index e081c62fedc..18b5a8110ab 100644 --- a/usr.sbin/bind/lib/dns/rdata/in_1/wks_11.c +++ b/usr.sbin/bind/lib/dns/rdata/in_1/wks_11.c @@ -14,18 +14,18 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: wks_11.c,v 1.11 2020/01/21 23:59:20 tedu Exp $ */ +/* $Id: wks_11.c,v 1.12 2020/02/04 19:17:59 florian Exp $ */ /* Reviewed: Fri Mar 17 15:01:49 PST 2000 by explorer */ #ifndef RDATA_IN_1_WKS_11_C #define RDATA_IN_1_WKS_11_C +#include <netdb.h> #include <limits.h> #include <stdlib.h> #include <isc/net.h> -#include <isc/netdb.h> /* * Redefine CHECK here so cppcheck "sees" the define. diff --git a/usr.sbin/bind/lib/isc/unix/include/isc/netdb.h b/usr.sbin/bind/lib/isc/unix/include/isc/netdb.h deleted file mode 100644 index 1e65d0444d4..00000000000 --- a/usr.sbin/bind/lib/isc/unix/include/isc/netdb.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* $Id: netdb.h,v 1.3 2019/12/17 01:46:37 sthen Exp $ */ - -#ifndef ISC_NETDB_H -#define ISC_NETDB_H 1 - -/***** - ***** Module Info - *****/ - -/*! \file - * \brief - * Portable netdb.h support. - * - * This module is responsible for defining the get<x>by<y> APIs. - * - * MP: - *\li No impact. - * - * Reliability: - *\li No anticipated impact. - * - * Resources: - *\li N/A. - * - * Security: - *\li No anticipated impact. - * - * Standards: - *\li BSD API - */ - -/*** - *** Imports. - ***/ - -#include <isc/net.h> - -#include <netdb.h> - -#endif /* ISC_NETDB_H */ |