summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--usr.bin/dig/dig.c3
-rw-r--r--usr.bin/dig/dig.h4
-rw-r--r--usr.bin/dig/dighost.c5
-rw-r--r--usr.bin/dig/host.c3
-rw-r--r--usr.bin/dig/lib/dns/dns_time.c5
-rw-r--r--usr.bin/dig/lib/dns/dst_api.c9
-rw-r--r--usr.bin/dig/lib/dns/rcode.c9
-rw-r--r--usr.bin/dig/lib/dns/rdata.c5
-rw-r--r--usr.bin/dig/lib/dns/rdata/generic/keydata_65533.c2
-rw-r--r--usr.bin/dig/lib/dns/ttl.c8
-rw-r--r--usr.bin/dig/lib/isc/base64.c7
-rw-r--r--usr.bin/dig/lib/isc/hex.c10
-rw-r--r--usr.bin/dig/lib/isc/include/isc/sha2.h4
-rw-r--r--usr.bin/dig/lib/isc/include/isc/socket.h5
-rw-r--r--usr.bin/dig/lib/isc/include/isc/timer.h5
-rw-r--r--usr.bin/dig/lib/isc/log.c5
-rw-r--r--usr.bin/dig/lib/isc/sha2.c6
-rw-r--r--usr.bin/dig/lib/isc/timer.c6
-rw-r--r--usr.bin/dig/lib/isc/unix/app.c2
-rw-r--r--usr.bin/dig/lib/isccfg/namedconf.c2
20 files changed, 42 insertions, 63 deletions
diff --git a/usr.bin/dig/dig.c b/usr.bin/dig/dig.c
index 104d689b5e8..edcca689ee9 100644
--- a/usr.bin/dig/dig.c
+++ b/usr.bin/dig/dig.c
@@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: dig.c,v 1.11 2020/02/18 18:11:27 florian Exp $ */
+/* $Id: dig.c,v 1.12 2020/02/24 13:49:38 jsg Exp $ */
/*! \file */
#include <sys/cdefs.h>
@@ -27,6 +27,7 @@
#include <string.h>
#include <isc/util.h>
+#include <isc/time.h>
#include <dns/fixedname.h>
#include <dns/masterdump.h>
diff --git a/usr.bin/dig/dig.h b/usr.bin/dig/dig.h
index 7866b4f0804..04312f1f9f5 100644
--- a/usr.bin/dig/dig.h
+++ b/usr.bin/dig/dig.h
@@ -19,13 +19,13 @@
/*! \file */
+#include <time.h>
+
#include <dst/dst.h>
#include <isc/boolean.h>
#include <isc/buffer.h>
-
#include <isc/list.h>
-#include <isc/time.h>
#include <isc/sockaddr.h>
#include <isc/socket.h>
diff --git a/usr.bin/dig/dighost.c b/usr.bin/dig/dighost.c
index 4d47e9ed94c..78c00754653 100644
--- a/usr.bin/dig/dighost.c
+++ b/usr.bin/dig/dighost.c
@@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: dighost.c,v 1.17 2020/02/24 12:06:13 florian Exp $ */
+/* $Id: dighost.c,v 1.18 2020/02/24 13:49:38 jsg Exp $ */
/*! \file
* \note
@@ -33,6 +33,8 @@
#include <resolv.h>
#include <stdlib.h>
#include <string.h>
+#include <time.h>
+#include <stdint.h>
#include <dns/byaddr.h>
#include <dns/fixedname.h>
@@ -51,7 +53,6 @@
#include <dst/dst.h>
#include <dst/result.h>
-#include <isc/app.h>
#include <isc/base64.h>
#include <isc/hex.h>
#include <isc/log.h>
diff --git a/usr.bin/dig/host.c b/usr.bin/dig/host.c
index 71a95ce9265..267231667e7 100644
--- a/usr.bin/dig/host.c
+++ b/usr.bin/dig/host.c
@@ -23,9 +23,12 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include <time.h>
+#include <stdint.h>
#include <isc/app.h>
#include <isc/util.h>
+#include <isc/time.h>
#include <dns/fixedname.h>
#include <dns/message.h>
diff --git a/usr.bin/dig/lib/dns/dns_time.c b/usr.bin/dig/lib/dns/dns_time.c
index 3f42911fd95..b0a30cb5e57 100644
--- a/usr.bin/dig/lib/dns/dns_time.c
+++ b/usr.bin/dig/lib/dns/dns_time.c
@@ -14,19 +14,18 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: dns_time.c,v 1.5 2020/02/23 19:54:25 jung Exp $ */
+/* $Id: dns_time.c,v 1.6 2020/02/24 13:49:38 jsg Exp $ */
/*! \file */
#include <stdio.h>
#include <string.h> /* Required for HP/UX (and others?) */
#include <time.h>
-#include <ctype.h>
#include <isc/region.h>
#include <isc/serial.h>
+#include <isc/result.h>
-#include <dns/result.h>
#include <dns/time.h>
static const int days[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
diff --git a/usr.bin/dig/lib/dns/dst_api.c b/usr.bin/dig/lib/dns/dst_api.c
index 1a10c0cef75..c20cf4745b9 100644
--- a/usr.bin/dig/lib/dns/dst_api.c
+++ b/usr.bin/dig/lib/dns/dst_api.c
@@ -33,26 +33,19 @@
/*
* Principal Author: Brian Wellington
- * $Id: dst_api.c,v 1.11 2020/02/23 08:54:01 florian Exp $
+ * $Id: dst_api.c,v 1.12 2020/02/24 13:49:38 jsg Exp $
*/
/*! \file */
#include <stdlib.h>
#include <isc/buffer.h>
-#include <isc/lex.h>
#include <isc/refcount.h>
#include <isc/safe.h>
#include <string.h>
#include <isc/util.h>
-#include <dns/fixedname.h>
#include <dns/keyvalues.h>
-#include <dns/name.h>
-#include <dns/rdata.h>
-#include <dns/rdataclass.h>
-#include <dns/ttl.h>
-#include <dns/types.h>
#include <dst/result.h>
diff --git a/usr.bin/dig/lib/dns/rcode.c b/usr.bin/dig/lib/dns/rcode.c
index 1496ac2b8c3..950b0265c10 100644
--- a/usr.bin/dig/lib/dns/rcode.c
+++ b/usr.bin/dig/lib/dns/rcode.c
@@ -14,24 +14,19 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: rcode.c,v 1.7 2020/02/23 19:54:25 jung Exp $ */
-
+/* $Id: rcode.c,v 1.8 2020/02/24 13:49:38 jsg Exp $ */
#include <ctype.h>
#include <stdlib.h>
+#include <string.h>
#include <isc/buffer.h>
-#include <isc/parseint.h>
-
#include <isc/region.h>
#include <isc/result.h>
-
-#include <string.h>
#include <isc/types.h>
#include <isc/util.h>
#include <dns/cert.h>
-#include <dns/ds.h>
#include <dns/keyvalues.h>
#include <dns/rcode.h>
#include <dns/rdataclass.h>
diff --git a/usr.bin/dig/lib/dns/rdata.c b/usr.bin/dig/lib/dns/rdata.c
index d38d8f4d8ba..5c542099f80 100644
--- a/usr.bin/dig/lib/dns/rdata.c
+++ b/usr.bin/dig/lib/dns/rdata.c
@@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: rdata.c,v 1.16 2020/02/24 12:06:50 florian Exp $ */
+/* $Id: rdata.c,v 1.17 2020/02/24 13:49:38 jsg Exp $ */
/*! \file */
@@ -25,9 +25,8 @@
#include <isc/base64.h>
#include <isc/hex.h>
-#include <isc/lex.h>
-#include <isc/parseint.h>
#include <isc/util.h>
+#include <isc/buffer.h>
#include <dns/cert.h>
#include <dns/compress.h>
diff --git a/usr.bin/dig/lib/dns/rdata/generic/keydata_65533.c b/usr.bin/dig/lib/dns/rdata/generic/keydata_65533.c
index 1b12f5daaa6..06cf5a9c28d 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/keydata_65533.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/keydata_65533.c
@@ -17,7 +17,7 @@
#ifndef GENERIC_KEYDATA_65533_C
#define GENERIC_KEYDATA_65533_C 1
-#include <isc/time.h>
+#include <time.h>
#include <dst/dst.h>
diff --git a/usr.bin/dig/lib/dns/ttl.c b/usr.bin/dig/lib/dns/ttl.c
index 619bda7a4a3..fcb652eabe0 100644
--- a/usr.bin/dig/lib/dns/ttl.c
+++ b/usr.bin/dig/lib/dns/ttl.c
@@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: ttl.c,v 1.3 2020/02/22 19:47:06 jung Exp $ */
+/* $Id: ttl.c,v 1.4 2020/02/24 13:49:38 jsg Exp $ */
/*! \file */
@@ -22,15 +22,12 @@
#include <ctype.h>
#include <stdio.h>
+#include <string.h>
#include <isc/buffer.h>
-#include <isc/parseint.h>
-
#include <isc/region.h>
-#include <string.h>
#include <isc/util.h>
-#include <dns/result.h>
#include <dns/ttl.h>
#define RETERR(x) do { \
@@ -39,7 +36,6 @@
return (_r); \
} while (0)
-
/*
* Helper for dns_ttl_totext().
*/
diff --git a/usr.bin/dig/lib/isc/base64.c b/usr.bin/dig/lib/isc/base64.c
index cb5d8f29fb3..6fa0a8a6325 100644
--- a/usr.bin/dig/lib/isc/base64.c
+++ b/usr.bin/dig/lib/isc/base64.c
@@ -14,16 +14,15 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: base64.c,v 1.2 2020/02/23 23:40:22 jsg Exp $ */
+/* $Id: base64.c,v 1.3 2020/02/24 13:49:38 jsg Exp $ */
/*! \file */
-
+#include <string.h>
#include <isc/base64.h>
#include <isc/buffer.h>
-#include <isc/lex.h>
-#include <string.h>
+#include <isc/region.h>
#include <isc/util.h>
#define RETERR(x) do { \
diff --git a/usr.bin/dig/lib/isc/hex.c b/usr.bin/dig/lib/isc/hex.c
index 0058c232075..6bd312b0cc4 100644
--- a/usr.bin/dig/lib/isc/hex.c
+++ b/usr.bin/dig/lib/isc/hex.c
@@ -14,18 +14,17 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: hex.c,v 1.2 2020/02/22 19:47:06 jung Exp $ */
+/* $Id: hex.c,v 1.3 2020/02/24 13:49:38 jsg Exp $ */
/*! \file */
-
-
#include <ctype.h>
+#include <string.h>
#include <isc/buffer.h>
#include <isc/hex.h>
-#include <isc/lex.h>
-#include <string.h>
+#include <isc/region.h>
+#include <isc/types.h>
#include <isc/util.h>
#define RETERR(x) do { \
@@ -34,7 +33,6 @@
return (_r); \
} while (0)
-
/*
* BEW: These static functions are copied from lib/dns/rdata.c.
*/
diff --git a/usr.bin/dig/lib/isc/include/isc/sha2.h b/usr.bin/dig/lib/isc/include/isc/sha2.h
index 9692482c501..4b58f684da2 100644
--- a/usr.bin/dig/lib/isc/include/isc/sha2.h
+++ b/usr.bin/dig/lib/isc/include/isc/sha2.h
@@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: sha2.h,v 1.3 2020/02/17 18:58:39 jung Exp $ */
+/* $Id: sha2.h,v 1.4 2020/02/24 13:49:38 jsg Exp $ */
/* $FreeBSD: src/sys/crypto/sha2/sha2.h,v 1.1.2.1 2001/07/03 11:01:36 ume Exp $ */
/* $KAME: sha2.h,v 1.3 2001/03/12 08:27:48 itojun Exp $ */
@@ -76,10 +76,8 @@
/*** SHA-256/384/512 Context Structures *******************************/
-#include <openssl/opensslv.h>
#include <openssl/evp.h>
-
typedef struct {
EVP_MD_CTX *ctx;
} isc_sha2_t;
diff --git a/usr.bin/dig/lib/isc/include/isc/socket.h b/usr.bin/dig/lib/isc/include/isc/socket.h
index 3f15155163a..188381d6e06 100644
--- a/usr.bin/dig/lib/isc/include/isc/socket.h
+++ b/usr.bin/dig/lib/isc/include/isc/socket.h
@@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: socket.h,v 1.5 2020/02/18 18:11:27 florian Exp $ */
+/* $Id: socket.h,v 1.6 2020/02/24 13:49:39 jsg Exp $ */
#ifndef ISC_SOCKET_H
#define ISC_SOCKET_H 1
@@ -56,12 +56,13 @@
*** Imports
***/
+#include <time.h>
+
#include <isc/event.h>
#include <isc/eventclass.h>
#include <isc/region.h>
#include <isc/sockaddr.h>
-#include <isc/time.h>
#include <isc/types.h>
/***
diff --git a/usr.bin/dig/lib/isc/include/isc/timer.h b/usr.bin/dig/lib/isc/include/isc/timer.h
index 6eb76fa61a3..59f725696cb 100644
--- a/usr.bin/dig/lib/isc/include/isc/timer.h
+++ b/usr.bin/dig/lib/isc/include/isc/timer.h
@@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: timer.h,v 1.10 2020/02/18 18:11:27 florian Exp $ */
+/* $Id: timer.h,v 1.11 2020/02/24 13:49:39 jsg Exp $ */
#ifndef ISC_TIMER_H
#define ISC_TIMER_H 1
@@ -71,10 +71,11 @@
*** Imports
***/
+#include <time.h>
+
#include <isc/types.h>
#include <isc/event.h>
#include <isc/eventclass.h>
-#include <isc/time.h>
/***
*** Types
diff --git a/usr.bin/dig/lib/isc/log.c b/usr.bin/dig/lib/isc/log.c
index 9648fb35619..2bc3c503d38 100644
--- a/usr.bin/dig/lib/isc/log.c
+++ b/usr.bin/dig/lib/isc/log.c
@@ -14,18 +14,19 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: log.c,v 1.16 2020/02/21 07:44:50 florian Exp $ */
+/* $Id: log.c,v 1.17 2020/02/24 13:49:38 jsg Exp $ */
/*! \file
* \author Principal Authors: DCL */
+#include <sys/time.h>
#include <limits.h>
#include <stdlib.h>
#include <string.h>
#include <syslog.h>
+#include <time.h>
#include <isc/log.h>
-#include <isc/time.h>
#include <isc/util.h>
/*
diff --git a/usr.bin/dig/lib/isc/sha2.c b/usr.bin/dig/lib/isc/sha2.c
index c2daccc619c..e1c729d95d5 100644
--- a/usr.bin/dig/lib/isc/sha2.c
+++ b/usr.bin/dig/lib/isc/sha2.c
@@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: sha2.c,v 1.3 2020/02/17 18:58:39 jung Exp $ */
+/* $Id: sha2.c,v 1.4 2020/02/24 13:49:38 jsg Exp $ */
/* $FreeBSD: src/sys/crypto/sha2/sha2.c,v 1.2.2.2 2002/03/05 08:36:47 ume Exp $ */
/* $KAME: sha2.c,v 1.8 2001/11/08 01:07:52 itojun Exp $ */
@@ -54,10 +54,6 @@
*
*/
-
-
-
-#include <isc/safe.h>
#include <isc/sha2.h>
#include <string.h>
#include <isc/util.h>
diff --git a/usr.bin/dig/lib/isc/timer.c b/usr.bin/dig/lib/isc/timer.c
index 42cea44d9af..b880e33674f 100644
--- a/usr.bin/dig/lib/isc/timer.c
+++ b/usr.bin/dig/lib/isc/timer.c
@@ -14,15 +14,15 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: timer.c,v 1.22 2020/02/24 00:17:44 aoyama Exp $ */
+/* $Id: timer.c,v 1.23 2020/02/24 13:49:38 jsg Exp $ */
/*! \file */
-
+#include <sys/time.h>
#include <stdlib.h>
+#include <time.h>
#include <isc/heap.h>
#include <isc/task.h>
-#include <isc/time.h>
#include <isc/timer.h>
#include <isc/util.h>
diff --git a/usr.bin/dig/lib/isc/unix/app.c b/usr.bin/dig/lib/isc/unix/app.c
index 2fe62279087..f6705f3bb9c 100644
--- a/usr.bin/dig/lib/isc/unix/app.c
+++ b/usr.bin/dig/lib/isc/unix/app.c
@@ -17,10 +17,10 @@
/*! \file */
#include <stddef.h>
-#include <stdlib.h>
#include <errno.h>
#include <signal.h>
#include <sys/time.h>
+#include <time.h>
#include <isc/app.h>
#include <isc/boolean.h>
diff --git a/usr.bin/dig/lib/isccfg/namedconf.c b/usr.bin/dig/lib/isccfg/namedconf.c
index 970577f9732..661c5d67f73 100644
--- a/usr.bin/dig/lib/isccfg/namedconf.c
+++ b/usr.bin/dig/lib/isccfg/namedconf.c
@@ -17,8 +17,6 @@
/*! \file */
#include <stdlib.h>
-#include <isc/util.h>
-
#include <isccfg/cfg.h>
#include <isccfg/grammar.h>
Copyright © 1996 – 2023 Jason A. Donenfeld. All Rights Reverse Engineered.