From b9db91aa64cffaa62f2f46b8b37f930feaf0d80c Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org>
Date: Mon, 19 Mar 2018 17:23:23 +0000
Subject: [PATCH] fix duplicate include guard in dnsconf.h

- IMHO we should consider removing dnsconf.c and deprecating the
  /etc/dns.conf file, though, as I don't think it's likely anyone
  is using it

(cherry picked from commit a08ba418ef31b55df5069f326c8fb654d38cb05b)
---
 lib/isccfg/include/isccfg/dnsconf.h | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/isccfg/include/isccfg/dnsconf.h b/lib/isccfg/include/isccfg/dnsconf.h
index 5c01f7472f..809d699f88 100644
--- a/lib/isccfg/include/isccfg/dnsconf.h
+++ b/lib/isccfg/include/isccfg/dnsconf.h
@@ -9,10 +9,8 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: dnsconf.h,v 1.3 2009/09/02 23:48:03 tbox Exp $ */
-
-#ifndef ISCCFG_NAMEDCONF_H
-#define ISCCFG_NAMEDCONF_H 1
+#ifndef ISCCFG_DNSCONF_H
+#define ISCCFG_DNSCONF_H 1
 
 /*! \file
  * \brief
@@ -27,4 +25,4 @@
 LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_dnsconf;
 /*%< A complete dns.conf file. */
 
-#endif /* ISCCFG_CFG_H */
+#endif /* ISCCFG_DNSCONF_H */