144. [cleanup] libdns header files too numerous to name were made

                        to conform to the same style for multiple inclusion
                        protection.

CHANGES

+ 144.   [cleanup]       libdns header files too numerous to name were made
+                        to conform to the same style for multiple inclusion
+                        protection.
+
  143.   [func]		Added function dns_rdatatype_isknown().
 
  142.   [cleanup]       <isc/stdtime.h> does not need <time.h> or

bin/named/include/named/zoneconf.h

@@ -15,8 +15,8 @@
  * SOFTWARE.
  */
 
-#ifndef NS_ZONECONF_H
-#define NS_ZONECONF_H 1
+#ifndef DNS_ZONECONF_H
+#define DNS_ZONECONF_H 1
 
 #include <isc/log.h>
 #include <isc/types.h>
@@ -63,4 +63,4 @@ dns_zonemgr_configure(dns_c_ctx_t *cctx, dns_zonemgr_t *zonemgr);
  */
 ISC_LANG_ENDDECLS
 
-#endif /* NS_ZONECONF_H */
+#endif /* DNS_ZONECONF_H */

lib/dns/config/confpvt.h

@@ -15,8 +15,8 @@
  * SOFTWARE.
  */
 
-#ifndef DNS_CONFIG_CONFPVT_H
-#define DNS_CONFIG_CONFPVT_H 1
+#ifndef CONFIG_CONFPVT_H
+#define CONFIG_CONFPVT_H 1
 
 /*****
  ***** Module Info
@@ -38,4 +38,4 @@
 #define DNS_C_CHECKBIT(bit,flags) \
      ISC_TF((*(flags) & ((dns_c_setbits_t)1 << (bit))) == ((dns_c_setbits_t)1 << (bit)))
 
-#endif
+#endif /* CONFIG_CONFPVT_H */

lib/dns/gen-unix.h

@@ -27,6 +27,9 @@
  * The dir stuff was shrunk to fit the needs of gen.c.
  */
 
+#ifndef DNS_GEN_UNIX_H
+#define DNS_GEN_UNIX_H 1
+
 #include <dirent.h>
 #include <unistd.h>
 
@@ -77,3 +80,4 @@ end_directory(isc_dir_t *dir) {
 	dir->handle = NULL;
 }
 
+#endif /* DNS_GEN_UNIX_H */

lib/dns/gen-win32.h

@@ -48,7 +48,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: gen-win32.h,v 1.2 2000/02/03 23:43:47 halley Exp $ */
+/* $Id: gen-win32.h,v 1.3 2000/04/29 02:01:07 tale Exp $ */
 
 /*
  * Principal Authors: Computer Systems Research Group at UC Berkeley
@@ -73,6 +73,9 @@
  * isc/commandline.c.  The dir stuff was shrunk to fit the needs of gen.c.
  */
 
+#ifndef DNS_GEN_WIN32_H
+#define DNS_GEN_WIN32_H 1
+
 #include <stdio.h>
 #include <string.h>
 #include <windows.h>
@@ -280,3 +283,5 @@ end_directory(isc_dir_t *dir) {
 	if (dir->handle != INVALID_HANDLE_VALUE)
 		FindClose(dir->handle);
 }
+
+#endif /* DNS_GEN_WIN32_H */

lib/dns/include/dns/a6.h

@@ -79,4 +79,4 @@ dns_a6_foreach(dns_a6context_t *a6ctx, dns_rdataset_t *rdataset,
 
 ISC_LANG_ENDDECLS
 
-#endif /* DNS_RESULT_H */
+#endif /* DNS_A6_H */

lib/dns/include/dns/adb.h

@@ -16,7 +16,7 @@
  */
 
 #ifndef DNS_ADB_H
-#define DNS_ADB_H
+#define DNS_ADB_H 1
 
 /***** 
  ***** Module Info 

lib/dns/include/dns/cache.h

@@ -224,4 +224,3 @@ dns_cache_setcleaninginterval(dns_cache_t *cache, unsigned int interval);
 ISC_LANG_ENDDECLS
 
 #endif /* DNS_CACHE_H */
-

lib/dns/include/dns/confacl.h

@@ -15,8 +15,8 @@
  * SOFTWARE.
  */
 
-#ifndef DNS_CONFIG_CONFACL_H
-#define DNS_CONFIG_CONFACL_H 1
+#ifndef DNS_CONFACL_H
+#define DNS_CONFACL_H 1
 
 /*****
  ***** Module Info
@@ -304,4 +304,4 @@ isc_result_t dns_c_acl_expandacls(dns_c_acltable_t *table,
  *	ISC_R_SUCCESS		-- all is well
  *	ISC_R_FAILURE		-- some acl(s) couldn't be resolved.
  */
-#endif /* DNS_CONFIG_CONFACL_H */
+#endif /* DNS_CONFACL_H */

lib/dns/include/dns/confcache.h

@@ -15,8 +15,8 @@
  * SOFTWARE.
  */
 
-#ifndef DNS_CONFIG_CONFCACHE_H
-#define DNS_CONFIG_CONFCACHE_H 1
+#ifndef DNS_CONFCACHE_H
+#define DNS_CONFCACHE_H 1
 
 /*****
  ***** Module Info
@@ -101,4 +101,4 @@ isc_result_t dns_c_cache_delete(dns_c_cache_t **cfgres);
  */
 
 
-#endif /* DNS_CONFIG_CONFCACHE_H */
+#endif /* DNS_CONFCACHE_H */

lib/dns/include/dns/confcommon.h

@@ -15,8 +15,8 @@
  * SOFTWARE.
  */
 
-#ifndef DNS_CONFIG_CONFCOMMON_H
-#define DNS_CONFIG_CONFCOMMON_H 1
+#ifndef DNS_CONFCOMMON_H
+#define DNS_CONFCOMMON_H 1
 
 /*****
  ***** Module Info
@@ -330,4 +330,4 @@ isc_result_t		dns_c_checkmodule(const char *name);
  */
 
 
-#endif /* DNS_CONFIG_CONFCOMMON_H */
+#endif /* DNS_CONFCOMMON_H */

lib/dns/include/dns/confctl.h

@@ -15,8 +15,8 @@
  * SOFTWARE.
  */
 
-#ifndef DNS_CONFIG_CONFCTL_H
-#define DNS_CONFIG_CONFCTL_H 1
+#ifndef DNS_CONFCTL_H
+#define DNS_CONFCTL_H 1
 
 /*****
  ***** Module Info
@@ -218,4 +218,4 @@ void		dns_c_ctrllist_print(FILE *fp, int indent,
  */
 
 
-#endif /* DNS_CONFIG_CONFCTL_H */
+#endif /* DNS_CONFCTL_H */

lib/dns/include/dns/confctx.h

@@ -15,8 +15,8 @@
  * SOFTWARE.
  */
 
-#ifndef DNS_CONFIG_CONFCTX_H
-#define DNS_CONFIG_CONFCTX_H 1
+#ifndef DNS_CONFCTX_H
+#define DNS_CONFCTX_H 1
 
 /*****
  ***** Module Info
@@ -777,5 +777,5 @@ isc_result_t	dns_c_ctx_gettrustedkeys(dns_c_ctx_t *cfg,
 
 
 
-#endif /* DNS_CONFIG_CONFCTX_H */
+#endif /* DNS_CONFCTX_H */
 

lib/dns/include/dns/confip.h

@@ -15,8 +15,8 @@
  * SOFTWARE.
  */
 
-#ifndef DNS_CONFIG_CONFIP_H
-#define DNS_CONFIG_CONFIP_H 1
+#ifndef DNS_CONFIP_H
+#define DNS_CONFIP_H 1
 
 /*****
  ***** Module Info
@@ -234,4 +234,4 @@ isc_boolean_t dns_c_ipmatchelement_equal(dns_c_ipmatchelement_t *e1,
 isc_boolean_t dns_c_ipmatchlist_equal(dns_c_ipmatchlist_t *l1,
 				      dns_c_ipmatchlist_t *l2);
 
-#endif /* DNS_CONFIG_CONFIP_H */
+#endif /* DNS_CONFIP_H */

lib/dns/include/dns/confkeys.h

@@ -15,8 +15,8 @@
  * SOFTWARE.
  */
 
-#ifndef DNS_CONFIG_CONFKEYS_H
-#define DNS_CONFIG_CONFKEYS_H 1
+#ifndef DNS_CONFKEYS_H
+#define DNS_CONFKEYS_H 1
 
 /*****
  ***** Module Info
@@ -304,4 +304,4 @@ void		dns_c_tkey_print(FILE *fp, int indent, dns_c_tkey_t *tkey);
 
 
 
-#endif /* DNS_CONFIG_CONFKEYS_H */
+#endif /* DNS_CONFKEYS_H */

lib/dns/include/dns/conflog.h

@@ -15,8 +15,8 @@
  * SOFTWARE.
  */
 
-#ifndef DNS_CONFIG_CONFLOG_H
-#define DNS_CONFIG_CONFLOG_H 1
+#ifndef DNS_CONFLOG_H
+#define DNS_CONFLOG_H 1
 
 /*****
  ***** Module Info
@@ -254,4 +254,4 @@ isc_result_t	dns_c_logcat_setpredef(dns_c_logcat_t *logcat,
 isc_result_t	dns_c_logcat_getpredef(dns_c_logcat_t *logcat,
 					isc_boolean_t *retval);
 
-#endif /* ISC_WHATEVER_H */
+#endif /* DNS_CONFLOG_H */

lib/dns/include/dns/conflsn.h

@@ -15,8 +15,8 @@
  * SOFTWARE.
  */
 
-#ifndef DNS_CONFIG_CONFLSN_H
-#define DNS_CONFIG_CONFLSN_H 1
+#ifndef DNS_CONFLSN_H
+#define DNS_CONFLSN_H 1
 
 /*****
  ***** Module Info
@@ -192,4 +192,4 @@ isc_result_t	dns_c_lstnon_print(FILE *fp, int indent,
 
 
 
-#endif /* DNS_CONFIG_CONFLSN_H */
+#endif /* DNS_CONFLSN_H */

lib/dns/include/dns/confndc.h

@@ -15,8 +15,8 @@
  * SOFTWARE.
  */
 
-#ifndef DNS_CONFIG_CONFNDC_H
-#define DNS_CONFIG_CONFNDC_H 1
+#ifndef DNS_CONFNDC_H
+#define DNS_CONFNDC_H 1
 
 #include <isc/magic.h>
 #include <isc/mem.h>
@@ -153,4 +153,4 @@ void		dns_c_ndcserverlist_print(FILE *fp,
 void		dns_c_ndcserver_print(FILE *fp, dns_c_ndcserver_t *server);
 
 
-#endif /* DNS_CONFIG_CONFZONE_H */
+#endif /* DNS_CONFNDC_H */

lib/dns/include/dns/confparser.h

@@ -15,6 +15,9 @@
  * SOFTWARE.
  */
 
+#ifndef DNS_CONFPARSER_H
+#define DNS_CONFPARSER_H 1
+
 /*****
  ***** Module Info
  *****/
@@ -108,3 +111,4 @@ isc_result_t dns_c_parse_namedconf(const char *filename, isc_mem_t *mem,
  *	ISC_R_FAILURE			file contains errors.
  */
 
+#endif /* DNS_CONFPARSER_H */

lib/dns/include/dns/confresolv.h

@@ -15,8 +15,8 @@
  * SOFTWARE.
  */
 
-#ifndef DNS_CONFIG_CONFRESOLV_H
-#define DNS_CONFIG_CONFRESOLV_H 1
+#ifndef DNS_CONFRESOLV_H
+#define DNS_CONFRESOLV_H 1
 
 /*****
  ***** Module Info
@@ -100,4 +100,4 @@ isc_result_t dns_c_resolv_delete(dns_c_resolv_t **cfgres);
  */
 
 
-#endif /* DNS_CONFIG_CONFRESOLV_H */
+#endif /* DNS_CONFRESOLV_H */

lib/dns/include/dns/confrrset.h

@@ -15,8 +15,8 @@
  * SOFTWARE.
  */
 
-#ifndef DNS_CONFIG_CONFRRSET_H
-#define DNS_CONFIG_CONFRRSET_H 1
+#ifndef DNS_CONFRRSET_H
+#define DNS_CONFRRSET_H 1
 
 /*****
  ***** Module Info
@@ -131,4 +131,4 @@ void		dns_c_rrso_print(FILE *fp, int indent,
 				 dns_c_rrso_t *rrlist);
 
 
-#endif /* DNS_CONFIG_CONFRRSET_H */
+#endif /* DNS_CONFRRSET_H */

lib/dns/include/dns/confview.h

@@ -15,8 +15,8 @@
  * SOFTWARE.
  */
 
-#ifndef DNS_CONFIG_CONFVIEW_H
-#define DNS_CONFIG_CONFVIEW_H 1
+#ifndef DNS_CONFVIEW_H
+#define DNS_CONFVIEW_H 1
 
 /*****
  ***** Module Info
@@ -493,4 +493,4 @@ isc_result_t	dns_c_view_unsetserialqueries(dns_c_view_t *view);
 
 
 
-#endif /* DNS_CONFIG_CONFVIEW_H */
+#endif /* DNS_CONFVIEW_H */

lib/dns/include/dns/confzone.h

@@ -15,8 +15,8 @@
  * SOFTWARE.
  */
 
-#ifndef DNS_CONFIG_CONFZONE_H
-#define DNS_CONFIG_CONFZONE_H 1
+#ifndef DNS_CONFZONE_H
+#define DNS_CONFZONE_H 1
 
 /*****
  ***** Module Info
@@ -400,4 +400,4 @@ isc_result_t	dns_c_zone_getallowupd(dns_c_zone_t *zone,
 				       dns_c_ipmatchlist_t **retval);
 isc_result_t	dns_c_zone_unsetallowupd(dns_c_zone_t *zone);
 
-#endif /* DNS_CONFIG_CONFZONE_H */
+#endif /* DNS_CONFZONE_H */

lib/dns/include/dns/dbtable.h

@@ -15,6 +15,9 @@
  * SOFTWARE.
  */
 
+#ifndef DNS_DBTABLE_H
+#define DNS_DBTABLE_H 1
+
 /*****
  ***** Module Info
  *****/
@@ -152,3 +155,5 @@ dns_dbtable_find(dns_dbtable_t *dbtable, dns_name_t *name,
  * Returns:  ISC_R_SUCCESS		on success
  *	     <something else>		no default and match
  */
+
+#endif /* DNS_DBTABLE_H */

lib/dns/include/dns/namedconf.h

@@ -31,4 +31,4 @@
 #include <dns/confzone.h>
 #include <dns/peer.h>
 
-#endif
+#endif /* DNS_NAMEDCONF_H */

lib/dns/include/dns/peer.h

@@ -146,4 +146,4 @@ isc_result_t	dns_peer_getkey(dns_peer_t *peer, dns_name_t **retval);
 isc_result_t	dns_peer_setkey(dns_peer_t *peer, dns_name_t **keyval);
 
 
-#endif /* DNS_CONFIG_CONFSERV_H */
+#endif /* DNS_PEER_H */

lib/dns/include/dns/rdataslab.h

@@ -115,4 +115,4 @@ dns_rdataslab_subtract(unsigned char *mslab, unsigned char *sslab,
 
 ISC_LANG_ENDDECLS
 
-#endif /* DNS_RDATADLAB_H */
+#endif /* DNS_RDATASLAB_H */

lib/dns/include/dns/tcpmsg.h

@@ -16,7 +16,7 @@
  */
 
 #ifndef DNS_TCPMSG_H
-#define DNS_TCPMSG_H
+#define DNS_TCPMSG_H 1
 
 #include <isc/buffer.h>
 #include <isc/int.h>

lib/dns/include/dns/ttl.h

@@ -71,4 +71,4 @@ dns_ttl_fromtext(isc_textregion_t *source, isc_uint32_t *ttl);
 
 ISC_LANG_ENDDECLS
 
-#endif	/* DNS_MASTER_H */
+#endif /* DNS_TTL_H */

lib/dns/include/dns/zoneconf.h

@@ -15,8 +15,8 @@
  * SOFTWARE.
  */
 
-#ifndef NS_ZONECONF_H
-#define NS_ZONECONF_H 1
+#ifndef DNS_ZONECONF_H
+#define DNS_ZONECONF_H 1
 
 #include <isc/log.h>
 #include <isc/types.h>
@@ -63,4 +63,4 @@ dns_zonemgr_configure(dns_c_ctx_t *cctx, dns_zonemgr_t *zonemgr);
  */
 ISC_LANG_ENDDECLS
 
-#endif /* NS_ZONECONF_H */
+#endif /* DNS_ZONECONF_H */

lib/dns/include/dns/zt.h

@@ -16,7 +16,7 @@
  */