Add lib/dns/zone_p.h

Add a new private header file, lib/dns/zone_p.h, which will hold type
definitions and function prototypes not meant to be exported by libdns,
but required by zone-related unit tests.

(cherry picked from commit c1bc3be80692606c13b4549d3718ad2116718d6c)
(cherry picked from commit 2b0add6d1ab2d4f173b6e37556170e07d6978272)
(cherry picked from commit 536d6dc0c59e28e288bc8a6c90ffb38558d434f3)

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index b83df7f500434324a0fd31e6f3fdcc3cc03373f5..85f416b6e43f1a8d5b3746f35c9bad7f3174f5d6 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -85,6 +85,8 @@
 
 #include <dst/dst.h>
 
+#include "zone_p.h"
+
 #define ZONE_MAGIC                     ISC_MAGIC('Z', 'O', 'N', 'E')
 #define DNS_ZONE_VALID(zone)           ISC_MAGIC_VALID(zone, ZONE_MAGIC)
 

diff --git a/lib/dns/zone_p.h b/lib/dns/zone_p.h
new file mode 100644 (file)
index 0000000..24329b0
--- /dev/null
+++ b/lib/dns/zone_p.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ */
+
+#ifndef DNS_ZONE_P_H
+#define DNS_ZONE_P_H
+
+/*! \file */
+
+/*%
+ *     Types and functions below not be used outside this module and its
+ *     associated unit tests.
+ */
+
+ISC_LANG_BEGINDECLS
+
+ISC_LANG_ENDDECLS
+
+#endif /* DNS_ZONE_P_H */

diff --git a/util/copyrights b/util/copyrights
index fad4f465a2eee52977618a9faccff0b62dd363cd..691395a634a7092e7568ee30caca4da9cbe7aa58 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -3307,6 +3307,7 @@
 ./lib/dns/win32/version.c                      C       1998,1999,2000,2001,2004,2007,2013,2018
 ./lib/dns/xfrin.c                              C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2011,2012,2013,2015,2016,2017,2018
 ./lib/dns/zone.c                               C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
+./lib/dns/zone_p.h                             C       2018
 ./lib/dns/zonekey.c                            C       2001,2003,2004,2005,2007,2018
 ./lib/dns/zt.c                                 C       1999,2000,2001,2002,2004,2005,2006,2007,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/irs/Atffile                              X       2016,2018