From 4be63b1fd8c18dbeca1648d6cf22fa14f057a469 Mon Sep 17 00:00:00 2001 From: David Lawrence Date: Sat, 29 Apr 2000 02:02:38 +0000 Subject: [PATCH] 144. [cleanup] libdns header files too numerous to name were made to conform to the same style for multiple inclusion protection. --- CHANGES | 4 ++++ bin/named/include/named/zoneconf.h | 6 +++--- lib/dns/config/confpvt.h | 6 +++--- lib/dns/gen-unix.h | 4 ++++ lib/dns/gen-win32.h | 7 ++++++- lib/dns/include/dns/a6.h | 2 +- lib/dns/include/dns/adb.h | 2 +- lib/dns/include/dns/cache.h | 3 +-- lib/dns/include/dns/confacl.h | 6 +++--- lib/dns/include/dns/confcache.h | 6 +++--- lib/dns/include/dns/confcommon.h | 6 +++--- lib/dns/include/dns/confctl.h | 6 +++--- lib/dns/include/dns/confctx.h | 6 +++--- lib/dns/include/dns/confip.h | 6 +++--- lib/dns/include/dns/confkeys.h | 6 +++--- lib/dns/include/dns/conflog.h | 6 +++--- lib/dns/include/dns/conflsn.h | 6 +++--- lib/dns/include/dns/confndc.h | 6 +++--- lib/dns/include/dns/confparser.h | 4 ++++ lib/dns/include/dns/confresolv.h | 6 +++--- lib/dns/include/dns/confrrset.h | 6 +++--- lib/dns/include/dns/confview.h | 6 +++--- lib/dns/include/dns/confzone.h | 6 +++--- lib/dns/include/dns/dbtable.h | 5 +++++ lib/dns/include/dns/master.h | 2 +- lib/dns/include/dns/masterdump.h | 2 +- lib/dns/include/dns/message.h | 2 +- lib/dns/include/dns/namedconf.h | 2 +- lib/dns/include/dns/peer.h | 2 +- lib/dns/include/dns/rbt.h | 4 ++-- lib/dns/include/dns/rdataslab.h | 2 +- lib/dns/include/dns/tcpmsg.h | 2 +- lib/dns/include/dns/time.h | 2 +- lib/dns/include/dns/ttl.h | 2 +- lib/dns/include/dns/zone.h | 2 +- lib/dns/include/dns/zoneconf.h | 6 +++--- lib/dns/include/dns/zt.h | 6 +++--- lib/dns/rbtdb64.h | 2 +- lib/dns/rdata/any_255/tsig_250.h | 6 +++++- lib/dns/rdata/generic/afsdb_18.h | 8 +++++++- lib/dns/rdata/generic/cert_37.h | 6 +++++- lib/dns/rdata/generic/cname_5.h | 7 ++++++- lib/dns/rdata/generic/dname_39.h | 7 ++++++- lib/dns/rdata/generic/gpos_27.h | 7 ++++++- lib/dns/rdata/generic/hinfo_13.h | 7 ++++++- lib/dns/rdata/generic/isdn_20.h | 7 ++++++- lib/dns/rdata/generic/key_25.h | 7 ++++++- lib/dns/rdata/generic/loc_29.h | 7 ++++++- lib/dns/rdata/generic/mb_7.h | 7 ++++++- lib/dns/rdata/generic/md_3.h | 7 ++++++- lib/dns/rdata/generic/mf_4.h | 7 ++++++- lib/dns/rdata/generic/mg_8.h | 7 ++++++- lib/dns/rdata/generic/minfo_14.h | 7 ++++++- lib/dns/rdata/generic/mr_9.h | 7 ++++++- lib/dns/rdata/generic/mx_15.h | 7 ++++++- lib/dns/rdata/generic/ns_2.h | 7 ++++++- lib/dns/rdata/generic/null_10.h | 7 ++++++- lib/dns/rdata/generic/nxt_30.h | 7 ++++++- lib/dns/rdata/generic/opt_41.h | 7 ++++++- lib/dns/rdata/generic/proforma.h | 7 ++++++- lib/dns/rdata/generic/ptr_12.h | 7 ++++++- lib/dns/rdata/generic/rp_17.h | 7 ++++++- lib/dns/rdata/generic/rt_21.h | 7 ++++++- lib/dns/rdata/generic/sig_24.h | 7 ++++++- lib/dns/rdata/generic/soa_6.h | 7 ++++++- lib/dns/rdata/generic/tkey_249.h | 7 ++++++- lib/dns/rdata/generic/txt_16.h | 6 +++++- lib/dns/rdata/generic/unspec_103.h | 7 ++++++- lib/dns/rdata/generic/x25_19.h | 7 ++++++- lib/dns/rdata/hs_4/a_1.h | 7 ++++++- lib/dns/rdata/in_1/a6_38.h | 6 +++++- lib/dns/rdata/in_1/a_1.h | 7 ++++++- lib/dns/rdata/in_1/aaaa_28.h | 6 +++++- lib/dns/rdata/in_1/kx_36.h | 7 ++++++- lib/dns/rdata/in_1/naptr_35.h | 7 ++++++- lib/dns/rdata/in_1/nsap-ptr_23.h | 7 ++++++- lib/dns/rdata/in_1/nsap_22.h | 7 ++++++- lib/dns/rdata/in_1/px_26.h | 7 ++++++- lib/dns/rdata/in_1/srv_33.h | 6 +++++- lib/dns/rdata/in_1/wks_11.h | 7 ++++++- lib/dns/sec/dnssafe/ahcbcpad.h | 7 ++++--- lib/dns/sec/dnssafe/ahchdig.h | 7 ++++--- lib/dns/sec/dnssafe/ahchencr.h | 7 ++++--- lib/dns/sec/dnssafe/ahchgen.h | 7 ++++--- lib/dns/sec/dnssafe/ahchrand.h | 7 ++++--- lib/dns/sec/dnssafe/ahdigest.h | 7 ++++--- lib/dns/sec/dnssafe/ahencryp.h | 7 ++++--- lib/dns/sec/dnssafe/ahgen.h | 7 ++++--- lib/dns/sec/dnssafe/ahrandom.h | 7 ++++--- lib/dns/sec/dnssafe/ahrsaenc.h | 7 ++++--- lib/dns/sec/dnssafe/ahrsaepr.h | 7 ++++--- lib/dns/sec/dnssafe/ahrsaepu.h | 7 ++++--- lib/dns/sec/dnssafe/aichdig.h | 7 ++++--- lib/dns/sec/dnssafe/aichenc8.h | 7 ++++--- lib/dns/sec/dnssafe/aichencn.h | 7 ++++--- lib/dns/sec/dnssafe/aichencr.h | 7 ++++--- lib/dns/sec/dnssafe/aichgen.h | 7 ++++--- lib/dns/sec/dnssafe/aichrand.h | 7 ++++--- lib/dns/sec/dnssafe/ainfotyp.h | 7 ++++--- lib/dns/sec/dnssafe/ainull.h | 5 +++++ lib/dns/sec/dnssafe/algae.h | 7 ++++--- lib/dns/sec/dnssafe/algchoic.h | 6 +++--- lib/dns/sec/dnssafe/algobj.h | 4 ++++ lib/dns/sec/dnssafe/amdigest.h | 4 ++++ lib/dns/sec/dnssafe/amencdec.h | 4 ++++ lib/dns/sec/dnssafe/amgen.h | 4 ++++ lib/dns/sec/dnssafe/amrandom.h | 4 ++++ lib/dns/sec/dnssafe/atypes.h | 7 ++++--- lib/dns/sec/dnssafe/balg.h | 7 ++++--- lib/dns/sec/dnssafe/balgmeth.h | 4 ++++ lib/dns/sec/dnssafe/bigmath.h | 7 ++++--- lib/dns/sec/dnssafe/bigmaxes.h | 7 ++++--- lib/dns/sec/dnssafe/binfocsh.h | 7 ++++--- lib/dns/sec/dnssafe/bkey.h | 7 ++++--- lib/dns/sec/dnssafe/bmempool.h | 7 ++++--- lib/dns/sec/dnssafe/bsafe2.h | 7 ++++--- lib/dns/sec/dnssafe/btypechk.h | 7 ++++--- lib/dns/sec/dnssafe/crt2.h | 6 +++--- lib/dns/sec/dnssafe/digrand.h | 7 ++++--- lib/dns/sec/dnssafe/global.h | 7 ++++--- lib/dns/sec/dnssafe/intitem.h | 4 ++++ lib/dns/sec/dnssafe/keyobj.h | 4 ++++ lib/dns/sec/dnssafe/ki8byte.h | 5 +++++ lib/dns/sec/dnssafe/kifulprv.h | 5 +++++ lib/dns/sec/dnssafe/kiitem.h | 5 +++++ lib/dns/sec/dnssafe/kinfotyp.h | 5 +++++ lib/dns/sec/dnssafe/kipkcrpr.h | 4 ++++ lib/dns/sec/dnssafe/kirsapub.h | 4 ++++ lib/dns/sec/dnssafe/md5.h | 7 ++++--- lib/dns/sec/dnssafe/md5rand.h | 7 ++++--- lib/dns/sec/dnssafe/prime.h | 7 ++++--- lib/dns/sec/dnssafe/rsa.h | 7 ++++--- lib/dns/sec/dnssafe/rsakeygn.h | 7 ++++--- lib/dns/sec/dnssafe/secrcbc.h | 7 ++++--- lib/dns/sec/dnssafe/surrendr.h | 7 ++++--- lib/dns/sec/dst/dst_internal.h | 9 +++++---- lib/dns/sec/dst/dst_parse.h | 8 ++++---- lib/dns/sec/openssl/bn_asm.c | 1 + lib/dns/sec/openssl/bn_lcl.h | 6 +++--- lib/dns/sec/openssl/bn_prime.h | 5 +++++ lib/dns/sec/openssl/cryptlib.h | 6 +++--- lib/dns/sec/openssl/include/openssl/bio.h | 7 +++---- lib/dns/sec/openssl/include/openssl/bn.h | 8 ++++---- lib/dns/sec/openssl/include/openssl/buffer.h | 6 +++--- lib/dns/sec/openssl/include/openssl/crypto.h | 6 +++--- lib/dns/sec/openssl/include/openssl/dh.h | 8 ++++---- lib/dns/sec/openssl/include/openssl/dsa.h | 8 ++++---- lib/dns/sec/openssl/include/openssl/e_os.h | 6 +++--- lib/dns/sec/openssl/include/openssl/e_os2.h | 6 +++--- lib/dns/sec/openssl/include/openssl/err.h | 13 +++++++------ lib/dns/sec/openssl/include/openssl/lhash.h | 8 ++++---- lib/dns/sec/openssl/include/openssl/md5.h | 7 ++++--- lib/dns/sec/openssl/include/openssl/opensslconf.h | 6 +++--- lib/dns/sec/openssl/include/openssl/opensslv.h | 7 ++++--- lib/dns/sec/openssl/include/openssl/rand.h | 6 +++--- lib/dns/sec/openssl/include/openssl/safestack.h | 7 ++++--- lib/dns/sec/openssl/include/openssl/sha.h | 7 ++++--- lib/dns/sec/openssl/include/openssl/stack.h | 7 ++++--- lib/dns/sec/openssl/md32_common.h | 4 ++++ lib/dns/sec/openssl/md5_locl.h | 5 +++++ lib/dns/sec/openssl/sha_locl.h | 4 ++++ lib/dns/sec/rename-dnssafe.h | 4 ++++ lib/dns/sec/rename.h | 4 ++++ 163 files changed, 669 insertions(+), 307 deletions(-) diff --git a/CHANGES b/CHANGES index c41e32f81c..eba60a719f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ + 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] does not need or diff --git a/bin/named/include/named/zoneconf.h b/bin/named/include/named/zoneconf.h index b148caf2fb..064e772a95 100644 --- a/bin/named/include/named/zoneconf.h +++ b/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 #include @@ -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 */ diff --git a/lib/dns/config/confpvt.h b/lib/dns/config/confpvt.h index 402054d249..23763efcec 100644 --- a/lib/dns/config/confpvt.h +++ b/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 */ diff --git a/lib/dns/gen-unix.h b/lib/dns/gen-unix.h index 3802f3fd7d..a440519c4c 100644 --- a/lib/dns/gen-unix.h +++ b/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 #include @@ -77,3 +80,4 @@ end_directory(isc_dir_t *dir) { dir->handle = NULL; } +#endif /* DNS_GEN_UNIX_H */ diff --git a/lib/dns/gen-win32.h b/lib/dns/gen-win32.h index dd9b9ed03d..2a9916592c 100644 --- a/lib/dns/gen-win32.h +++ b/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 #include #include @@ -280,3 +283,5 @@ end_directory(isc_dir_t *dir) { if (dir->handle != INVALID_HANDLE_VALUE) FindClose(dir->handle); } + +#endif /* DNS_GEN_WIN32_H */ diff --git a/lib/dns/include/dns/a6.h b/lib/dns/include/dns/a6.h index 25b10ff5fd..55691b1071 100644 --- a/lib/dns/include/dns/a6.h +++ b/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 */ diff --git a/lib/dns/include/dns/adb.h b/lib/dns/include/dns/adb.h index 76b2149444..a3c4e00b54 100644 --- a/lib/dns/include/dns/adb.h +++ b/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 diff --git a/lib/dns/include/dns/cache.h b/lib/dns/include/dns/cache.h index f3f62f37e6..d2de23660a 100644 --- a/lib/dns/include/dns/cache.h +++ b/lib/dns/include/dns/cache.h @@ -223,5 +223,4 @@ dns_cache_setcleaninginterval(dns_cache_t *cache, unsigned int interval); ISC_LANG_ENDDECLS -#endif /* DNS_CACHE_H */ - +#endif /* DNS_CACHE_H */ diff --git a/lib/dns/include/dns/confacl.h b/lib/dns/include/dns/confacl.h index c33464177b..e81c00ea7f 100644 --- a/lib/dns/include/dns/confacl.h +++ b/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 */ diff --git a/lib/dns/include/dns/confcache.h b/lib/dns/include/dns/confcache.h index 9c3228cc52..eb5e836880 100644 --- a/lib/dns/include/dns/confcache.h +++ b/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 */ diff --git a/lib/dns/include/dns/confcommon.h b/lib/dns/include/dns/confcommon.h index d3276da8e3..4b5fbd2f4a 100644 --- a/lib/dns/include/dns/confcommon.h +++ b/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 */ diff --git a/lib/dns/include/dns/confctl.h b/lib/dns/include/dns/confctl.h index b3a19a9d8a..c0e8ffbe41 100644 --- a/lib/dns/include/dns/confctl.h +++ b/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 */ diff --git a/lib/dns/include/dns/confctx.h b/lib/dns/include/dns/confctx.h index 78128f7604..4b5d6df8d2 100644 --- a/lib/dns/include/dns/confctx.h +++ b/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 */ diff --git a/lib/dns/include/dns/confip.h b/lib/dns/include/dns/confip.h index f4117a218d..faa1324a82 100644 --- a/lib/dns/include/dns/confip.h +++ b/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 */ diff --git a/lib/dns/include/dns/confkeys.h b/lib/dns/include/dns/confkeys.h index 8303397e8b..87acc4405b 100644 --- a/lib/dns/include/dns/confkeys.h +++ b/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 */ diff --git a/lib/dns/include/dns/conflog.h b/lib/dns/include/dns/conflog.h index 9d4229a5bd..81d63cf1ec 100644 --- a/lib/dns/include/dns/conflog.h +++ b/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 */ diff --git a/lib/dns/include/dns/conflsn.h b/lib/dns/include/dns/conflsn.h index 030f92a207..ca83f58c43 100644 --- a/lib/dns/include/dns/conflsn.h +++ b/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 */ diff --git a/lib/dns/include/dns/confndc.h b/lib/dns/include/dns/confndc.h index 0351a83bbd..34f21e7cd0 100644 --- a/lib/dns/include/dns/confndc.h +++ b/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 #include @@ -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 */ diff --git a/lib/dns/include/dns/confparser.h b/lib/dns/include/dns/confparser.h index c8a808b5e8..cc09f9c0e0 100644 --- a/lib/dns/include/dns/confparser.h +++ b/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 */ diff --git a/lib/dns/include/dns/confresolv.h b/lib/dns/include/dns/confresolv.h index 7836a8ec42..ff280905f1 100644 --- a/lib/dns/include/dns/confresolv.h +++ b/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 */ diff --git a/lib/dns/include/dns/confrrset.h b/lib/dns/include/dns/confrrset.h index f8051f9328..27ca526152 100644 --- a/lib/dns/include/dns/confrrset.h +++ b/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 */ diff --git a/lib/dns/include/dns/confview.h b/lib/dns/include/dns/confview.h index db8e916fa4..9f27314052 100644 --- a/lib/dns/include/dns/confview.h +++ b/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 */ diff --git a/lib/dns/include/dns/confzone.h b/lib/dns/include/dns/confzone.h index 6477531d78..df7c123a17 100644 --- a/lib/dns/include/dns/confzone.h +++ b/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 */ diff --git a/lib/dns/include/dns/dbtable.h b/lib/dns/include/dns/dbtable.h index 0cac2693d7..2294fb8586 100644 --- a/lib/dns/include/dns/dbtable.h +++ b/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 * no default and match */ + +#endif /* DNS_DBTABLE_H */ diff --git a/lib/dns/include/dns/master.h b/lib/dns/include/dns/master.h index 163a113ae7..00e7d08543 100644 --- a/lib/dns/include/dns/master.h +++ b/lib/dns/include/dns/master.h @@ -107,4 +107,4 @@ isc_result_t dns_master_loadbuffer(isc_buffer_t *buffer, ISC_LANG_ENDDECLS -#endif /* DNS_MASTER_H */ +#endif /* DNS_MASTER_H */ diff --git a/lib/dns/include/dns/masterdump.h b/lib/dns/include/dns/masterdump.h index f6ea27345b..f7b433687f 100644 --- a/lib/dns/include/dns/masterdump.h +++ b/lib/dns/include/dns/masterdump.h @@ -99,4 +99,4 @@ dns_master_dump(isc_mem_t *mctx, dns_db_t *db, ISC_LANG_ENDDECLS -#endif /* DNS_MASTERDUMP_H */ +#endif /* DNS_MASTERDUMP_H */ diff --git a/lib/dns/include/dns/message.h b/lib/dns/include/dns/message.h index 2825496598..2b8105d76c 100644 --- a/lib/dns/include/dns/message.h +++ b/lib/dns/include/dns/message.h @@ -952,4 +952,4 @@ dns_message_checksig(dns_message_t *msg, dns_view_t *view); ISC_LANG_ENDDECLS -#endif /* DNS_MESSAGE_H */ +#endif /* DNS_MESSAGE_H */ diff --git a/lib/dns/include/dns/namedconf.h b/lib/dns/include/dns/namedconf.h index 7d74c27953..9ec121c4c5 100644 --- a/lib/dns/include/dns/namedconf.h +++ b/lib/dns/include/dns/namedconf.h @@ -31,4 +31,4 @@ #include #include -#endif +#endif /* DNS_NAMEDCONF_H */ diff --git a/lib/dns/include/dns/peer.h b/lib/dns/include/dns/peer.h index d41c98cfbb..a9ffccec7c 100644 --- a/lib/dns/include/dns/peer.h +++ b/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 */ diff --git a/lib/dns/include/dns/rbt.h b/lib/dns/include/dns/rbt.h index 3a33bfc6b0..2176c74927 100644 --- a/lib/dns/include/dns/rbt.h +++ b/lib/dns/include/dns/rbt.h @@ -15,8 +15,8 @@ * SOFTWARE. */ -#ifndef DNS_RBT_H -#define DNS_RBT_H 1 +#ifndef DNS_RBT_H +#define DNS_RBT_H 1 #include #include diff --git a/lib/dns/include/dns/rdataslab.h b/lib/dns/include/dns/rdataslab.h index fd2e4a7979..1ff3d73bfc 100644 --- a/lib/dns/include/dns/rdataslab.h +++ b/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 */ diff --git a/lib/dns/include/dns/tcpmsg.h b/lib/dns/include/dns/tcpmsg.h index ab94280e87..205467a0c5 100644 --- a/lib/dns/include/dns/tcpmsg.h +++ b/lib/dns/include/dns/tcpmsg.h @@ -16,7 +16,7 @@ */ #ifndef DNS_TCPMSG_H -#define DNS_TCPMSG_H +#define DNS_TCPMSG_H 1 #include #include diff --git a/lib/dns/include/dns/time.h b/lib/dns/include/dns/time.h index 12953ff5da..b9be33ef23 100644 --- a/lib/dns/include/dns/time.h +++ b/lib/dns/include/dns/time.h @@ -62,4 +62,4 @@ isc_result_t dns_time32_totext(isc_uint32_t value, isc_buffer_t *target); ISC_LANG_ENDDECLS -#endif /* DNS_TIME_H */ +#endif /* DNS_TIME_H */ diff --git a/lib/dns/include/dns/ttl.h b/lib/dns/include/dns/ttl.h index 3a1453473a..9cb238c275 100644 --- a/lib/dns/include/dns/ttl.h +++ b/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 */ diff --git a/lib/dns/include/dns/zone.h b/lib/dns/include/dns/zone.h index ce14fbe0b7..9f73cbc361 100644 --- a/lib/dns/include/dns/zone.h +++ b/lib/dns/include/dns/zone.h @@ -885,4 +885,4 @@ dns_zonemgr_gettransferlist(dns_zonemgr_t *zmgr); ISC_LANG_ENDDECLS -#endif /* DNS_ZONE_H */ +#endif /* DNS_ZONE_H */ diff --git a/lib/dns/include/dns/zoneconf.h b/lib/dns/include/dns/zoneconf.h index b148caf2fb..064e772a95 100644 --- a/lib/dns/include/dns/zoneconf.h +++ b/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 #include @@ -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 */ diff --git a/lib/dns/include/dns/zt.h b/lib/dns/include/dns/zt.h index 70d2d93bdd..9175425257 100644 --- a/lib/dns/include/dns/zt.h +++ b/lib/dns/include/dns/zt.h @@ -15,8 +15,8 @@ * SOFTWARE. */ -#ifndef DNS_ZT_H -#define DNS_ZT_H +#ifndef DNS_ZT_H +#define DNS_ZT_H 1 #include @@ -157,4 +157,4 @@ dns_zt_apply(dns_zt_t *zt, isc_boolean_t stop, ISC_LANG_ENDDECLS -#endif +#endif /* DNS_ZT_H */ diff --git a/lib/dns/rbtdb64.h b/lib/dns/rbtdb64.h index d52e89b87e..3f336ba8bb 100644 --- a/lib/dns/rbtdb64.h +++ b/lib/dns/rbtdb64.h @@ -33,4 +33,4 @@ dns_rbtdb64_create(isc_mem_t *mctx, dns_name_t *base, isc_boolean_t is_cache, dns_rdataclass_t rdclass, unsigned int argc, char *argv[], dns_db_t **dbp); -#endif /* DNS_RBTDB_H */ +#endif /* DNS_RBTDB64_H */ diff --git a/lib/dns/rdata/any_255/tsig_250.h b/lib/dns/rdata/any_255/tsig_250.h index f032abd244..11f2987342 100644 --- a/lib/dns/rdata/any_255/tsig_250.h +++ b/lib/dns/rdata/any_255/tsig_250.h @@ -15,9 +15,11 @@ * SOFTWARE. */ -/* $Id: tsig_250.h,v 1.15 2000/03/16 23:13:02 gson Exp $ */ +/* $Id: tsig_250.h,v 1.16 2000/04/29 02:01:34 tale Exp $ */ /* draft-ietf-dnsext-tsig-00.txt */ +#ifndef ANY_255_TSIG_250_H +#define ANY_255_TSIG_250_H 1 typedef struct dns_rdata_any_tsig { dns_rdatacommon_t common; @@ -32,3 +34,5 @@ typedef struct dns_rdata_any_tsig { isc_uint16_t otherlen; unsigned char * other; } dns_rdata_any_tsig_t; + +#endif /* ANY_255_TSIG_250_H */ diff --git a/lib/dns/rdata/generic/afsdb_18.h b/lib/dns/rdata/generic/afsdb_18.h index ab95751a56..5730c92569 100644 --- a/lib/dns/rdata/generic/afsdb_18.h +++ b/lib/dns/rdata/generic/afsdb_18.h @@ -15,7 +15,10 @@ * SOFTWARE. */ -/* $Id: afsdb_18.h,v 1.11 2000/04/28 21:48:37 marka Exp $ */ +#ifndef GENERIC_AFSDB_18_H +#define GENERIC_AFSDB_18_H 1 + +/* $Id: afsdb_18.h,v 1.12 2000/04/29 02:01:35 tale Exp $ */ /* RFC 1183 */ @@ -25,3 +28,6 @@ typedef struct dns_rdata_afsdb { isc_uint16_t subtype; dns_name_t server; } dns_rdata_afsdb_t; + +#endif /* GENERIC_AFSDB_18_H */ + diff --git a/lib/dns/rdata/generic/cert_37.h b/lib/dns/rdata/generic/cert_37.h index df4b8caf43..ed3a5651c0 100644 --- a/lib/dns/rdata/generic/cert_37.h +++ b/lib/dns/rdata/generic/cert_37.h @@ -15,9 +15,11 @@ * SOFTWARE. */ -/* $Id: cert_37.h,v 1.11 2000/04/28 21:48:38 marka Exp $ */ +/* $Id: cert_37.h,v 1.12 2000/04/29 02:01:35 tale Exp $ */ /* RFC 2538 */ +#ifndef GENERIC_CERT_37_H +#define GENERIC_CERT_37_H 1 typedef struct dns_rdata_cert { dns_rdatacommon_t common; @@ -28,3 +30,5 @@ typedef struct dns_rdata_cert { isc_uint16_t length; unsigned char *certificate; } dns_rdata_cert_t; + +#endif /* GENERIC_CERT_37_H */ diff --git a/lib/dns/rdata/generic/cname_5.h b/lib/dns/rdata/generic/cname_5.h index bf4808cb0f..7f6021dee0 100644 --- a/lib/dns/rdata/generic/cname_5.h +++ b/lib/dns/rdata/generic/cname_5.h @@ -15,7 +15,10 @@ * SOFTWARE. */ -/* $Id: cname_5.h,v 1.17 2000/04/26 18:27:55 marka Exp $ */ +/* $Id: cname_5.h,v 1.18 2000/04/29 02:01:35 tale Exp $ */ + +#ifndef GENERIC_CNAME_5_H +#define GENERIC_CNAME_5_H 1 #include @@ -24,3 +27,5 @@ typedef struct dns_rdata_cname { isc_mem_t *mctx; dns_name_t cname; } dns_rdata_cname_t; + +#endif /* GENERIC_CNAME_5_H */ diff --git a/lib/dns/rdata/generic/dname_39.h b/lib/dns/rdata/generic/dname_39.h index 83baf8616b..09fd6b276c 100644 --- a/lib/dns/rdata/generic/dname_39.h +++ b/lib/dns/rdata/generic/dname_39.h @@ -15,7 +15,10 @@ * SOFTWARE. */ -/* $Id: dname_39.h,v 1.10 2000/04/26 18:27:56 marka Exp $ */ +#ifndef GENERIC_DNAME_39_H +#define GENERIC_DNAME_39_H 1 + +/* $Id: dname_39.h,v 1.11 2000/04/29 02:01:37 tale Exp $ */ /* draft-ietf-dnsind-dname-02.txt */ @@ -26,3 +29,5 @@ typedef struct dns_rdata_dname { isc_mem_t *mctx; dns_name_t dname; } dns_rdata_dname_t; + +#endif /* GENERIC_DNAME_39_H */ diff --git a/lib/dns/rdata/generic/gpos_27.h b/lib/dns/rdata/generic/gpos_27.h index 9b60bbcb25..9605015c16 100644 --- a/lib/dns/rdata/generic/gpos_27.h +++ b/lib/dns/rdata/generic/gpos_27.h @@ -15,7 +15,10 @@ * SOFTWARE. */ -/* $Id: gpos_27.h,v 1.8 2000/04/28 21:48:39 marka Exp $ */ +#ifndef GENERIC_GPOS_27_H +#define GENERIC_GPOS_27_H 1 + +/* $Id: gpos_27.h,v 1.9 2000/04/29 02:01:37 tale Exp $ */ /* RFC 1712 */ @@ -29,3 +32,5 @@ typedef struct dns_rdata_gpos { isc_uint8_t lat_len; isc_uint8_t alt_len; } dns_rdata_gpos_t; + +#endif /* GENERIC_GPOS_27_H */ diff --git a/lib/dns/rdata/generic/hinfo_13.h b/lib/dns/rdata/generic/hinfo_13.h index 19b82f22de..73f9d8319b 100644 --- a/lib/dns/rdata/generic/hinfo_13.h +++ b/lib/dns/rdata/generic/hinfo_13.h @@ -15,7 +15,10 @@ * SOFTWARE. */ -/* $Id: hinfo_13.h,v 1.16 2000/04/28 21:48:40 marka Exp $ */ +#ifndef GENERIC_HINFO_13_H +#define GENERIC_HINFO_13_H 1 + +/* $Id: hinfo_13.h,v 1.17 2000/04/29 02:01:37 tale Exp $ */ typedef struct dns_rdata_hinfo { dns_rdatacommon_t common; @@ -25,3 +28,5 @@ typedef struct dns_rdata_hinfo { isc_int8_t cpu_len; isc_int8_t os_len; } dns_rdata_hinfo_t; + +#endif /* GENERIC_HINFO_13_H */ diff --git a/lib/dns/rdata/generic/isdn_20.h b/lib/dns/rdata/generic/isdn_20.h index 2b96d6fe82..b47428b2a7 100644 --- a/lib/dns/rdata/generic/isdn_20.h +++ b/lib/dns/rdata/generic/isdn_20.h @@ -15,7 +15,10 @@ * SOFTWARE. */ -/* $Id: isdn_20.h,v 1.8 2000/04/28 21:48:41 marka Exp $ */ +#ifndef GENERIC_ISDN_20_H +#define GENERIC_ISDN_20_H 1 + +/* $Id: isdn_20.h,v 1.9 2000/04/29 02:01:38 tale Exp $ */ /* RFC 1183 */ @@ -27,3 +30,5 @@ typedef struct dns_rdata_isdn { isc_int8_t isdn_len; isc_int8_t sa_len; } dns_rdata_isdn_t; + +#endif /* GENERIC_ISDN_20_H */ diff --git a/lib/dns/rdata/generic/key_25.h b/lib/dns/rdata/generic/key_25.h index 45919c515a..25bd676592 100644 --- a/lib/dns/rdata/generic/key_25.h +++ b/lib/dns/rdata/generic/key_25.h @@ -15,7 +15,10 @@ * SOFTWARE. */ -/* $Id: key_25.h,v 1.10 2000/04/28 02:08:31 marka Exp $ */ +#ifndef GENERIC_KEY_25_H +#define GENERIC_KEY_25_H 1 + +/* $Id: key_25.h,v 1.11 2000/04/29 02:01:38 tale Exp $ */ /* RFC 2535 */ @@ -29,3 +32,5 @@ typedef struct dns_rdata_key_t { unsigned char * data; } dns_rdata_key_t; + +#endif /* GENERIC_KEY_25_H */ diff --git a/lib/dns/rdata/generic/loc_29.h b/lib/dns/rdata/generic/loc_29.h index 61c6e908a9..ce44e9f39e 100644 --- a/lib/dns/rdata/generic/loc_29.h +++ b/lib/dns/rdata/generic/loc_29.h @@ -15,7 +15,10 @@ * SOFTWARE. */ -/* $Id: loc_29.h,v 1.8 2000/04/28 21:48:43 marka Exp $ */ +#ifndef GENERIC_LOC_29_H +#define GENERIC_LOC_29_H 1 + +/* $Id: loc_29.h,v 1.9 2000/04/29 02:01:39 tale Exp $ */ /* RFC 1876 */ @@ -24,3 +27,5 @@ typedef struct dns_rdata_loc { isc_mem_t *mctx; dns_name_t loc; } dns_rdata_loc_t; + +#endif /* GENERIC_LOC_29_H */ diff --git a/lib/dns/rdata/generic/mb_7.h b/lib/dns/rdata/generic/mb_7.h index 2578af2817..71b95e2b14 100644 --- a/lib/dns/rdata/generic/mb_7.h +++ b/lib/dns/rdata/generic/mb_7.h @@ -15,7 +15,10 @@ * SOFTWARE. */ -/* $Id: mb_7.h,v 1.16 2000/04/26 18:27:56 marka Exp $ */ +#ifndef GENERIC_MB_7_H +#define GENERIC_MB_7_H 1 + +/* $Id: mb_7.h,v 1.17 2000/04/29 02:01:40 tale Exp $ */ #include @@ -24,3 +27,5 @@ typedef struct dns_rdata_mb { isc_mem_t *mctx; dns_name_t mb; } dns_rdata_mb_t; + +#endif /* GENERIC_MB_7_H */ diff --git a/lib/dns/rdata/generic/md_3.h b/lib/dns/rdata/generic/md_3.h index bff63fcfca..26786527fc 100644 --- a/lib/dns/rdata/generic/md_3.h +++ b/lib/dns/rdata/generic/md_3.h @@ -15,7 +15,10 @@ * SOFTWARE. */ -/* $Id: md_3.h,v 1.17 2000/04/28 21:48:44 marka Exp $ */ +#ifndef GENERIC_MD_3_H +#define GENERIC_MD_3_H 1 + +/* $Id: md_3.h,v 1.18 2000/04/29 02:01:41 tale Exp $ */ #include @@ -25,3 +28,5 @@ typedef struct dns_rdata_md { dns_name_t md; } dns_rdata_md_t; + +#endif /* GENERIC_MD_3_H */ diff --git a/lib/dns/rdata/generic/mf_4.h b/lib/dns/rdata/generic/mf_4.h index c86be9e107..32db0172c5 100644 --- a/lib/dns/rdata/generic/mf_4.h +++ b/lib/dns/rdata/generic/mf_4.h @@ -15,7 +15,10 @@ * SOFTWARE. */ -/* $Id: mf_4.h,v 1.15 2000/04/28 21:48:45 marka Exp $ */ +#ifndef GENERIC_MF_4_H +#define GENERIC_MF_4_H 1 + +/* $Id: mf_4.h,v 1.16 2000/04/29 02:01:41 tale Exp $ */ #include @@ -24,3 +27,5 @@ typedef struct dns_rdata_mf { isc_mem_t *mctx; dns_name_t mf; } dns_rdata_mf_t; + +#endif /* GENERIC_MF_4_H */ diff --git a/lib/dns/rdata/generic/mg_8.h b/lib/dns/rdata/generic/mg_8.h index 4ab2d6abcb..2ed8eb8a0f 100644 --- a/lib/dns/rdata/generic/mg_8.h +++ b/lib/dns/rdata/generic/mg_8.h @@ -15,7 +15,10 @@ * SOFTWARE. */ -/* $Id: mg_8.h,v 1.15 2000/04/28 21:48:46 marka Exp $ */ +#ifndef GENERIC_MG_8_H +#define GENERIC_MG_8_H 1 + +/* $Id: mg_8.h,v 1.16 2000/04/29 02:01:43 tale Exp $ */ #include @@ -24,3 +27,5 @@ typedef struct dns_rdata_mg { isc_mem_t *mctx; dns_name_t mg; } dns_rdata_mg_t; + +#endif /* GENERIC_MG_8_H */ diff --git a/lib/dns/rdata/generic/minfo_14.h b/lib/dns/rdata/generic/minfo_14.h index 00cdafc1ed..1285b602c3 100644 --- a/lib/dns/rdata/generic/minfo_14.h +++ b/lib/dns/rdata/generic/minfo_14.h @@ -15,7 +15,10 @@ * SOFTWARE. */ -/* $Id: minfo_14.h,v 1.16 2000/04/28 21:48:47 marka Exp $ */ +#ifndef GENERIC_MINFO_14_H +#define GENERIC_MINFO_14_H 1 + +/* $Id: minfo_14.h,v 1.17 2000/04/29 02:01:43 tale Exp $ */ #include @@ -25,3 +28,5 @@ typedef struct dns_rdata_minfo { dns_name_t rmailbox; dns_name_t emailbox; } dns_rdata_minfo_t; + +#endif /* GENERIC_MINFO_14_H */ diff --git a/lib/dns/rdata/generic/mr_9.h b/lib/dns/rdata/generic/mr_9.h index 9ca7fd45ba..f259db93bd 100644 --- a/lib/dns/rdata/generic/mr_9.h +++ b/lib/dns/rdata/generic/mr_9.h @@ -15,7 +15,10 @@ * SOFTWARE. */ -/* $Id: mr_9.h,v 1.15 2000/04/28 21:48:48 marka Exp $ */ +#ifndef GENERIC_MR_9_H +#define GENERIC_MR_9_H 1 + +/* $Id: mr_9.h,v 1.16 2000/04/29 02:01:44 tale Exp $ */ #include @@ -24,3 +27,5 @@ typedef struct dns_rdata_mr { isc_mem_t *mctx; dns_name_t mr; } dns_rdata_mr_t; + +#endif /* GENERIC_MR_9_H */ diff --git a/lib/dns/rdata/generic/mx_15.h b/lib/dns/rdata/generic/mx_15.h index 4d06d830e7..a29045b4c1 100644 --- a/lib/dns/rdata/generic/mx_15.h +++ b/lib/dns/rdata/generic/mx_15.h @@ -15,7 +15,10 @@ * SOFTWARE. */ -/* $Id: mx_15.h,v 1.18 2000/04/28 21:48:49 marka Exp $ */ +#ifndef GENERIC_MX_15_H +#define GENERIC_MX_15_H 1 + +/* $Id: mx_15.h,v 1.19 2000/04/29 02:01:44 tale Exp $ */ #include @@ -25,3 +28,5 @@ typedef struct dns_rdata_mx { isc_uint16_t pref; dns_name_t mx; } dns_rdata_mx_t; + +#endif /* GENERIC_MX_15_H */ diff --git a/lib/dns/rdata/generic/ns_2.h b/lib/dns/rdata/generic/ns_2.h index 6671291d47..5819879d19 100644 --- a/lib/dns/rdata/generic/ns_2.h +++ b/lib/dns/rdata/generic/ns_2.h @@ -15,7 +15,10 @@ * SOFTWARE. */ -/* $Id: ns_2.h,v 1.16 2000/03/20 22:57:13 gson Exp $ */ +#ifndef GENERIC_NS_2_H +#define GENERIC_NS_2_H 1 + +/* $Id: ns_2.h,v 1.17 2000/04/29 02:01:45 tale Exp $ */ #include @@ -25,3 +28,5 @@ typedef struct dns_rdata_ns { dns_name_t name; } dns_rdata_ns_t; + +#endif /* GENERIC_NS_2_H */ diff --git a/lib/dns/rdata/generic/null_10.h b/lib/dns/rdata/generic/null_10.h index 79155ab3ff..6e8339075c 100644 --- a/lib/dns/rdata/generic/null_10.h +++ b/lib/dns/rdata/generic/null_10.h @@ -15,7 +15,10 @@ * SOFTWARE. */ -/* $Id: null_10.h,v 1.14 2000/04/28 21:48:51 marka Exp $ */ +#ifndef GENERIC_NULL_10_H +#define GENERIC_NULL_10_H 1 + +/* $Id: null_10.h,v 1.15 2000/04/29 02:01:46 tale Exp $ */ typedef struct dns_rdata_null { dns_rdatacommon_t common; @@ -24,3 +27,5 @@ typedef struct dns_rdata_null { unsigned char *data; } dns_rdata_null_t; + +#endif /* GENERIC_NULL_10_H */ diff --git a/lib/dns/rdata/generic/nxt_30.h b/lib/dns/rdata/generic/nxt_30.h index 3a97fc1bf5..fc66d84571 100644 --- a/lib/dns/rdata/generic/nxt_30.h +++ b/lib/dns/rdata/generic/nxt_30.h @@ -15,7 +15,10 @@ * SOFTWARE. */ -/* $Id: nxt_30.h,v 1.13 2000/04/28 21:48:52 marka Exp $ */ +#ifndef GENERIC_NXT_30_H +#define GENERIC_NXT_30_H 1 + +/* $Id: nxt_30.h,v 1.14 2000/04/29 02:01:46 tale Exp $ */ /* RFC 2065 */ @@ -25,3 +28,5 @@ typedef struct dns_rdata_nxt { isc_uint16_t len; unsigned char *nxt; } dns_rdata_nxt_t; + +#endif /* GENERIC_NXT_30_H */ diff --git a/lib/dns/rdata/generic/opt_41.h b/lib/dns/rdata/generic/opt_41.h index 8bd277bd31..1ff0375051 100644 --- a/lib/dns/rdata/generic/opt_41.h +++ b/lib/dns/rdata/generic/opt_41.h @@ -15,7 +15,10 @@ * SOFTWARE. */ -/* $Id: opt_41.h,v 1.5 2000/04/28 21:48:53 marka Exp $ */ +#ifndef GENERIC_OPT_41_H +#define GENERIC_OPT_41_H 1 + +/* $Id: opt_41.h,v 1.6 2000/04/29 02:01:47 tale Exp $ */ /* RFC 2671 */ @@ -43,3 +46,5 @@ isc_result_t dns_rdata_opt_next(dns_rdata_opt_t *); isc_result_t dns_rdata_opt_current(dns_rdata_opt_t *, dns_rdata_opt_opcode_t *); ISC_LANG_ENDDECLS + +#endif /* GENERIC_OPT_41_H */ diff --git a/lib/dns/rdata/generic/proforma.h b/lib/dns/rdata/generic/proforma.h index ea4a5e3c52..b0b346a290 100644 --- a/lib/dns/rdata/generic/proforma.h +++ b/lib/dns/rdata/generic/proforma.h @@ -15,10 +15,15 @@ * SOFTWARE. */ -/* $Id: proforma.h,v 1.13 2000/03/20 22:57:14 gson Exp $ */ +#ifndef GENERIC_PROFORMA_H +#define GENERIC_PROFORMA_H 1 + +/* $Id: proforma.h,v 1.14 2000/04/29 02:01:47 tale Exp $ */ typedef struct dns_rdata_# { dns_rdatacommon_t common; isc_mem_t *mctx; /* if required */ /* type & class specific elements */ } dns_rdata_#_t; + +#endif /* GENERIC_PROFORMA_H */ diff --git a/lib/dns/rdata/generic/ptr_12.h b/lib/dns/rdata/generic/ptr_12.h index 3697082bb3..1d67b8a9c2 100644 --- a/lib/dns/rdata/generic/ptr_12.h +++ b/lib/dns/rdata/generic/ptr_12.h @@ -15,7 +15,10 @@ * SOFTWARE. */ -/* $Id: ptr_12.h,v 1.16 2000/04/28 21:48:55 marka Exp $ */ +#ifndef GENERIC_PTR_12_H +#define GENERIC_PTR_12_H 1 + +/* $Id: ptr_12.h,v 1.17 2000/04/29 02:01:48 tale Exp $ */ #include @@ -25,3 +28,5 @@ typedef struct dns_rdata_ptr { isc_mem_t *mctx; dns_name_t ptr; } dns_rdata_ptr_t; + +#endif /* GENERIC_PTR_12_H */ diff --git a/lib/dns/rdata/generic/rp_17.h b/lib/dns/rdata/generic/rp_17.h index 875cbe8e3d..4a46c24949 100644 --- a/lib/dns/rdata/generic/rp_17.h +++ b/lib/dns/rdata/generic/rp_17.h @@ -15,7 +15,10 @@ * SOFTWARE. */ -/* $Id: rp_17.h,v 1.11 2000/04/28 21:48:56 marka Exp $ */ +#ifndef GENERIC_RP_17_H +#define GENERIC_RP_17_H 1 + +/* $Id: rp_17.h,v 1.12 2000/04/29 02:01:48 tale Exp $ */ /* RFC 1183 */ @@ -28,3 +31,5 @@ typedef struct dns_rdata_rp { dns_name_t text; } dns_rdata_rp_t; + +#endif /* GENERIC_RP_17_H */ diff --git a/lib/dns/rdata/generic/rt_21.h b/lib/dns/rdata/generic/rt_21.h index 952359dde4..d6cd0a7d53 100644 --- a/lib/dns/rdata/generic/rt_21.h +++ b/lib/dns/rdata/generic/rt_21.h @@ -15,7 +15,10 @@ * SOFTWARE. */ -/* $Id: rt_21.h,v 1.11 2000/04/28 21:48:57 marka Exp $ */ +#ifndef GENERIC_RT_21_H +#define GENERIC_RT_21_H 1 + +/* $Id: rt_21.h,v 1.12 2000/04/29 02:01:49 tale Exp $ */ /* RFC 1183 */ @@ -27,3 +30,5 @@ typedef struct dns_rdata_rt { isc_uint16_t preference; dns_name_t host; } dns_rdata_rt_t; + +#endif /* GENERIC_RT_21_H */ diff --git a/lib/dns/rdata/generic/sig_24.h b/lib/dns/rdata/generic/sig_24.h index 1cefec8bcc..06cc35885e 100644 --- a/lib/dns/rdata/generic/sig_24.h +++ b/lib/dns/rdata/generic/sig_24.h @@ -15,7 +15,10 @@ * SOFTWARE. */ -/* $Id: sig_24.h,v 1.17 2000/04/28 02:08:33 marka Exp $ */ +#ifndef GENERIC_SIG_24_H +#define GENERIC_SIG_24_H 1 + +/* $Id: sig_24.h,v 1.18 2000/04/29 02:01:49 tale Exp $ */ /* RFC 2535 */ @@ -34,3 +37,5 @@ typedef struct dns_rdata_sig_t { unsigned char * signature; } dns_rdata_sig_t; + +#endif /* GENERIC_SIG_24_H */ diff --git a/lib/dns/rdata/generic/soa_6.h b/lib/dns/rdata/generic/soa_6.h index 2d112ba7d6..3dbe36ccf9 100644 --- a/lib/dns/rdata/generic/soa_6.h +++ b/lib/dns/rdata/generic/soa_6.h @@ -15,7 +15,10 @@ * SOFTWARE. */ -/* $Id: soa_6.h,v 1.20 2000/03/17 01:22:17 explorer Exp $ */ +#ifndef GENERIC_SOA_6_H +#define GENERIC_SOA_6_H 1 + +/* $Id: soa_6.h,v 1.21 2000/04/29 02:01:49 tale Exp $ */ #include @@ -31,3 +34,5 @@ typedef struct dns_rdata_soa { isc_uint32_t minimum; /* host order */ } dns_rdata_soa_t; + +#endif /* GENERIC_SOA_6_H */ diff --git a/lib/dns/rdata/generic/tkey_249.h b/lib/dns/rdata/generic/tkey_249.h index edb849701b..3d1fd489cb 100644 --- a/lib/dns/rdata/generic/tkey_249.h +++ b/lib/dns/rdata/generic/tkey_249.h @@ -15,7 +15,10 @@ * SOFTWARE. */ -/* $Id: tkey_249.h,v 1.14 2000/04/28 02:08:35 marka Exp $ */ +#ifndef GENERIC_TKEY_249_H +#define GENERIC_TKEY_249_H 1 + +/* $Id: tkey_249.h,v 1.15 2000/04/29 02:01:51 tale Exp $ */ /* draft-ietf-dnsind-tkey-00.txt */ @@ -33,3 +36,5 @@ typedef struct dns_rdata_key { unsigned char * other; } dns_rdata_tkey_t; + +#endif /* GENERIC_TKEY_249_H */ diff --git a/lib/dns/rdata/generic/txt_16.h b/lib/dns/rdata/generic/txt_16.h index 6a0a8051e4..80bb8f4a52 100644 --- a/lib/dns/rdata/generic/txt_16.h +++ b/lib/dns/rdata/generic/txt_16.h @@ -15,7 +15,10 @@ * SOFTWARE. */ -/* $Id: txt_16.h,v 1.15 2000/04/28 02:08:37 marka Exp $ */ +#ifndef GENERIC_TXT_16_H +#define GENERIC_TXT_16_H 1 + +/* $Id: txt_16.h,v 1.16 2000/04/29 02:01:51 tale Exp $ */ typedef struct dns_rdata_txt_string { @@ -42,3 +45,4 @@ isc_result_t dns_rdata_txt_current(dns_rdata_txt_t *, dns_rdata_txt_string_t *); ISC_LANG_ENDDECLS +#endif /* GENERIC_TXT_16_H */ diff --git a/lib/dns/rdata/generic/unspec_103.h b/lib/dns/rdata/generic/unspec_103.h index d6d368204f..74b8951db5 100644 --- a/lib/dns/rdata/generic/unspec_103.h +++ b/lib/dns/rdata/generic/unspec_103.h @@ -15,7 +15,10 @@ * SOFTWARE. */ - /* $Id: unspec_103.h,v 1.7 2000/04/28 21:48:58 marka Exp $ */ +#ifndef GENERIC_UNSPEC_103_H +#define GENERIC_UNSPEC_103_H 1 + + /* $Id: unspec_103.h,v 1.8 2000/04/29 02:01:52 tale Exp $ */ typedef struct dns_rdata_unspec_t { dns_rdatacommon_t common; @@ -23,3 +26,5 @@ typedef struct dns_rdata_unspec_t { unsigned char *data; isc_uint16_t datalen; } dns_rdata_unspec_t; + +#endif /* GENERIC_UNSPEC_103_H */ diff --git a/lib/dns/rdata/generic/x25_19.h b/lib/dns/rdata/generic/x25_19.h index 9978b99e9f..a3d9f482ce 100644 --- a/lib/dns/rdata/generic/x25_19.h +++ b/lib/dns/rdata/generic/x25_19.h @@ -15,7 +15,10 @@ * SOFTWARE. */ -/* $Id: x25_19.h,v 1.8 2000/04/28 21:48:59 marka Exp $ */ +#ifndef GENERIC_X25_19_H +#define GENERIC_X25_19_H 1 + +/* $Id: x25_19.h,v 1.9 2000/04/29 02:01:52 tale Exp $ */ /* RFC 1183 */ @@ -25,3 +28,5 @@ typedef struct dns_rdata_x25 { unsigned char *x25; isc_uint16_t x25_len; } dns_rdata_x25_t; + +#endif /* GENERIC_X25_19_H */ diff --git a/lib/dns/rdata/hs_4/a_1.h b/lib/dns/rdata/hs_4/a_1.h index 6e539ac8df..7a90e0e2d6 100644 --- a/lib/dns/rdata/hs_4/a_1.h +++ b/lib/dns/rdata/hs_4/a_1.h @@ -15,9 +15,14 @@ * SOFTWARE. */ -/* $Id: a_1.h,v 1.3 2000/03/20 22:57:15 gson Exp $ */ +#ifndef HS_4_A_1_H +#define HS_4_A_1_H 1 + +/* $Id: a_1.h,v 1.4 2000/04/29 02:01:53 tale Exp $ */ typedef struct dns_rdata_hs_a { dns_rdatacommon_t common; struct in_addr in_addr; } dns_rdata_hs_a_t; + +#endif /* HS_4_A_1_H */ diff --git a/lib/dns/rdata/in_1/a6_38.h b/lib/dns/rdata/in_1/a6_38.h index 4728244ab5..4971eaa628 100644 --- a/lib/dns/rdata/in_1/a6_38.h +++ b/lib/dns/rdata/in_1/a6_38.h @@ -15,7 +15,10 @@ * SOFTWARE. */ - /* $Id: a6_38.h,v 1.12 2000/02/03 23:43:16 halley Exp $ */ +#ifndef IN_1_A6_38_H +#define IN_1_A6_38_H 1 + + /* $Id: a6_38.h,v 1.13 2000/04/29 02:01:54 tale Exp $ */ /* draft-ietf-ipngwg-dns-lookups-03.txt */ @@ -27,3 +30,4 @@ typedef struct dns_rdata_in_a6 { struct in6_addr in6_addr; } dns_rdata_in_a6_t; +#endif /* IN_1_A6_38_H */ diff --git a/lib/dns/rdata/in_1/a_1.h b/lib/dns/rdata/in_1/a_1.h index cf215fa280..a2615d807b 100644 --- a/lib/dns/rdata/in_1/a_1.h +++ b/lib/dns/rdata/in_1/a_1.h @@ -15,9 +15,14 @@ * SOFTWARE. */ -/* $Id: a_1.h,v 1.18 2000/03/20 22:57:15 gson Exp $ */ +#ifndef IN_1_A_1_H +#define IN_1_A_1_H 1 + +/* $Id: a_1.h,v 1.19 2000/04/29 02:01:54 tale Exp $ */ typedef struct dns_rdata_in_a { dns_rdatacommon_t common; struct in_addr in_addr; } dns_rdata_in_a_t; + +#endif /* IN_1_A_1_H */ diff --git a/lib/dns/rdata/in_1/aaaa_28.h b/lib/dns/rdata/in_1/aaaa_28.h index c96e0e6219..30f60c3856 100644 --- a/lib/dns/rdata/in_1/aaaa_28.h +++ b/lib/dns/rdata/in_1/aaaa_28.h @@ -15,7 +15,10 @@ * SOFTWARE. */ -/* $Id: aaaa_28.h,v 1.12 2000/03/20 22:57:15 gson Exp $ */ +#ifndef IN_1_AAAA_28_H +#define IN_1_AAAA_28_H 1 + +/* $Id: aaaa_28.h,v 1.13 2000/04/29 02:01:55 tale Exp $ */ /* RFC 1886 */ @@ -24,3 +27,4 @@ typedef struct dns_rdata_in_aaaa { struct in6_addr in6_addr; } dns_rdata_in_aaaa_t; +#endif /* IN_1_AAAA_28_H */ diff --git a/lib/dns/rdata/in_1/kx_36.h b/lib/dns/rdata/in_1/kx_36.h index a27d368c1f..8e2306ed42 100644 --- a/lib/dns/rdata/in_1/kx_36.h +++ b/lib/dns/rdata/in_1/kx_36.h @@ -15,7 +15,10 @@ * SOFTWARE. */ -/* $Id: kx_36.h,v 1.11 2000/03/20 22:57:15 gson Exp $ */ +#ifndef IN_1_KX_36_H +#define IN_1_KX_36_H 1 + +/* $Id: kx_36.h,v 1.12 2000/04/29 02:01:55 tale Exp $ */ /* RFC 2230 */ @@ -25,3 +28,5 @@ typedef struct dns_rdata_in_kx { isc_uint16_t preference; dns_name_t exchange; } dns_rdata_in_kx_t; + +#endif /* IN_1_KX_36_H */ diff --git a/lib/dns/rdata/in_1/naptr_35.h b/lib/dns/rdata/in_1/naptr_35.h index aa9df182a4..0244689c9d 100644 --- a/lib/dns/rdata/in_1/naptr_35.h +++ b/lib/dns/rdata/in_1/naptr_35.h @@ -15,7 +15,10 @@ * SOFTWARE. */ -/* $Id: naptr_35.h,v 1.12 2000/04/28 21:49:01 marka Exp $ */ +#ifndef IN_1_NAPTR_35_H +#define IN_1_NAPTR_35_H 1 + +/* $Id: naptr_35.h,v 1.13 2000/04/29 02:01:56 tale Exp $ */ /* RFC 2168 */ @@ -32,3 +35,5 @@ typedef struct dns_rdata_in_naptr { isc_uint16_t regexp_len; dns_name_t replacement; } dns_rdata_in_naptr_t; + +#endif /* IN_1_NAPTR_35_H */ diff --git a/lib/dns/rdata/in_1/nsap-ptr_23.h b/lib/dns/rdata/in_1/nsap-ptr_23.h index dc3b529bfb..66e92ed4ff 100644 --- a/lib/dns/rdata/in_1/nsap-ptr_23.h +++ b/lib/dns/rdata/in_1/nsap-ptr_23.h @@ -15,7 +15,10 @@ * SOFTWARE. */ -/* $Id: nsap-ptr_23.h,v 1.10 2000/03/17 18:18:28 gson Exp $ */ +#ifndef IN_1_NSAP_PTR_23_H +#define IN_1_NSAP_PTR_23_H 1 + +/* $Id: nsap-ptr_23.h,v 1.11 2000/04/29 02:01:56 tale Exp $ */ /* RFC 1348. Obsoleted in RFC 1706 - use PTR instead. */ @@ -24,3 +27,5 @@ typedef struct dns_rdata_in_nsap_ptr { isc_mem_t *mctx; dns_name_t owner; } dns_rdata_in_nsap_ptr_t; + +#endif /* IN_1_NSAP_PTR_23_H */ diff --git a/lib/dns/rdata/in_1/nsap_22.h b/lib/dns/rdata/in_1/nsap_22.h index c970483e98..2d495c8c3f 100644 --- a/lib/dns/rdata/in_1/nsap_22.h +++ b/lib/dns/rdata/in_1/nsap_22.h @@ -15,7 +15,10 @@ * SOFTWARE. */ -/* $Id: nsap_22.h,v 1.9 2000/04/28 21:49:02 marka Exp $ */ +#ifndef IN_1_NSAP_22_H +#define IN_1_NSAP_22_H 1 + +/* $Id: nsap_22.h,v 1.10 2000/04/29 02:01:57 tale Exp $ */ /* RFC 1706 */ @@ -25,3 +28,5 @@ typedef struct dns_rdata_in_nsap { unsigned char *nsap; isc_uint16_t nsap_len; } dns_rdata_in_nsap_t; + +#endif /* IN_1_NSAP_22_H */ diff --git a/lib/dns/rdata/in_1/px_26.h b/lib/dns/rdata/in_1/px_26.h index 173ae77bc7..c97b7ad742 100644 --- a/lib/dns/rdata/in_1/px_26.h +++ b/lib/dns/rdata/in_1/px_26.h @@ -15,7 +15,10 @@ * SOFTWARE. */ -/* $Id: px_26.h,v 1.10 2000/03/20 19:32:10 gson Exp $ */ +#ifndef IN_1_PX_26_H +#define IN_1_PX_26_H 1 + +/* $Id: px_26.h,v 1.11 2000/04/29 02:01:57 tale Exp $ */ /* RFC 2163 */ @@ -26,3 +29,5 @@ typedef struct dns_rdata_in_px { dns_name_t map822; dns_name_t mapx400; } dns_rdata_in_px_t; + +#endif /* IN_1_PX_26_H */ diff --git a/lib/dns/rdata/in_1/srv_33.h b/lib/dns/rdata/in_1/srv_33.h index e0857e9b07..a5a9ea3d29 100644 --- a/lib/dns/rdata/in_1/srv_33.h +++ b/lib/dns/rdata/in_1/srv_33.h @@ -15,7 +15,10 @@ * SOFTWARE. */ -/* $Id: srv_33.h,v 1.10 2000/03/17 21:03:34 bwelling Exp $ */ +#ifndef IN_1_SRV_33_H +#define IN_1_SRV_33_H 1 + +/* $Id: srv_33.h,v 1.11 2000/04/29 02:01:58 tale Exp $ */ /* Reviewed: Fri Mar 17 13:01:00 PST 2000 by bwelling */ @@ -30,3 +33,4 @@ typedef struct dns_rdata_in_srv { dns_name_t target; } dns_rdata_in_srv_t; +#endif /* IN_1_SRV_33_H */ diff --git a/lib/dns/rdata/in_1/wks_11.h b/lib/dns/rdata/in_1/wks_11.h index 67a13815bc..d0553a523e 100644 --- a/lib/dns/rdata/in_1/wks_11.h +++ b/lib/dns/rdata/in_1/wks_11.h @@ -15,7 +15,10 @@ * SOFTWARE. */ -/* $Id: wks_11.h,v 1.15 2000/04/28 21:49:03 marka Exp $ */ +#ifndef IN_1_WKS_11_H +#define IN_1_WKS_11_H 1 + +/* $Id: wks_11.h,v 1.16 2000/04/29 02:01:59 tale Exp $ */ typedef struct dns_rdata_in_wks { dns_rdatacommon_t common; @@ -25,3 +28,5 @@ typedef struct dns_rdata_in_wks { unsigned char *map; isc_uint16_t map_len; } dns_rdata_in_wks_t; + +#endif /* IN_1_WKS_11_H */ diff --git a/lib/dns/sec/dnssafe/ahcbcpad.h b/lib/dns/sec/dnssafe/ahcbcpad.h index 9daa2435ea..201549768b 100644 --- a/lib/dns/sec/dnssafe/ahcbcpad.h +++ b/lib/dns/sec/dnssafe/ahcbcpad.h @@ -6,8 +6,8 @@ prohibited. */ -#ifndef _AHCBCPAD_H_ -#define _AHCBCPAD_H_ +#ifndef DNSSAFE_AHCBCPAD_H +#define DNSSAFE_AHCBCPAD_H 1 #include "ahchencr.h" @@ -34,4 +34,5 @@ int AHSecretCBCPadDecryptFinal PROTO_LIST ((THIS_ENCRYPT_DECRYPT *, unsigned char *, unsigned int *, unsigned int, B_Algorithm *, A_SURRENDER_CTX *)); -#endif +#endif /* DNSSAFE_AHCBCPAD_H */ + diff --git a/lib/dns/sec/dnssafe/ahchdig.h b/lib/dns/sec/dnssafe/ahchdig.h index d56df5ba92..b58eec7e55 100644 --- a/lib/dns/sec/dnssafe/ahchdig.h +++ b/lib/dns/sec/dnssafe/ahchdig.h @@ -6,8 +6,8 @@ prohibited. */ -#ifndef _AHCHDIG_H_ -#define _AHCHDIG_H_ 1 +#ifndef DNSSAFE_AHCHDIG_H +#define DNSSAFE_AHCHDIG_H 1 #include "ahdigest.h" #include "algchoic.h" @@ -29,4 +29,5 @@ int AHChooseDigestFinal PROTO_LIST ((THIS_DIGEST *, unsigned char *, unsigned int *, unsigned int, A_SURRENDER_CTX *)); -#endif +#endif /* DNSSAFE_AHCHDIG_H */ + diff --git a/lib/dns/sec/dnssafe/ahchencr.h b/lib/dns/sec/dnssafe/ahchencr.h index 4befa78349..836fc1ddbe 100644 --- a/lib/dns/sec/dnssafe/ahchencr.h +++ b/lib/dns/sec/dnssafe/ahchencr.h @@ -6,8 +6,8 @@ prohibited. */ -#ifndef _AHCHENCR_H_ -#define _AHCHENCR_H_ 1 +#ifndef DNSSAFE_AHCHENCR_H +#define DNSSAFE_AHCHENCR_H 1 #include "ahencryp.h" #include "algchoic.h" @@ -71,4 +71,5 @@ int AHChooseEncryptDecryptFinal PROTO_LIST ((THIS_ENCRYPT_DECRYPT *, unsigned char *, unsigned int *, unsigned int, B_Algorithm *, A_SURRENDER_CTX *)); -#endif +#endif /* DNSSAFE_AHCHENCR_H */ + diff --git a/lib/dns/sec/dnssafe/ahchgen.h b/lib/dns/sec/dnssafe/ahchgen.h index 8e7ecf3dc4..2c7cf3dd87 100644 --- a/lib/dns/sec/dnssafe/ahchgen.h +++ b/lib/dns/sec/dnssafe/ahchgen.h @@ -6,8 +6,8 @@ prohibited. */ -#ifndef _AHCHGEN_H_ -#define _AHCHGEN_H_ 1 +#ifndef DNSSAFE_AHCHGEN_H +#define DNSSAFE_AHCHGEN_H 1 #include "ahgen.h" #include "algchoic.h" @@ -41,4 +41,5 @@ int AHChooseGenerateKeypair PROTO_LIST int AHChooseGenerateParameters PROTO_LIST ((THIS_GENERATE *, B_Algorithm *, B_Algorithm *, A_SURRENDER_CTX *)); -#endif +#endif /* DNSSAFE_AHCHGEN_H */ + diff --git a/lib/dns/sec/dnssafe/ahchrand.h b/lib/dns/sec/dnssafe/ahchrand.h index 51e0f9847d..36d430cfaf 100644 --- a/lib/dns/sec/dnssafe/ahchrand.h +++ b/lib/dns/sec/dnssafe/ahchrand.h @@ -6,8 +6,8 @@ prohibited. */ -#ifndef _AHCHRAND_H_ -#define _AHCHRAND_H_ 1 +#ifndef DNSSAFE_AHCHRAND_H +#define DNSSAFE_AHCHRAND_H 1 #include "ahrandom.h" #include "algchoic.h" @@ -28,4 +28,5 @@ int AHChooseRandomUpdate PROTO_LIST int AHChooseRandomGenerateBytes PROTO_LIST ((THIS_RANDOM *, unsigned char *, unsigned int, A_SURRENDER_CTX *)); -#endif +#endif /* DNSSAFE_AHCHRAND_H */ + diff --git a/lib/dns/sec/dnssafe/ahdigest.h b/lib/dns/sec/dnssafe/ahdigest.h index d7cc5f932b..ee9ce4f3ca 100644 --- a/lib/dns/sec/dnssafe/ahdigest.h +++ b/lib/dns/sec/dnssafe/ahdigest.h @@ -6,8 +6,8 @@ prohibited. */ -#ifndef _AHDIGEST_H_ -#define _AHDIGEST_H_ 1 +#ifndef DNSSAFE_AHDIGEST_H +#define DNSSAFE_AHDIGEST_H 1 #include "btypechk.h" @@ -45,4 +45,5 @@ void AHDigestConstructor PROTO_LIST ((AHDigest *)); for B_TypeCheck, since this will just re-invoke this virtual destructor. */ -#endif +#endif /* DNSSAFE_AHDIGEST_H */ + diff --git a/lib/dns/sec/dnssafe/ahencryp.h b/lib/dns/sec/dnssafe/ahencryp.h index f7ab14caa6..d2cb28c48f 100644 --- a/lib/dns/sec/dnssafe/ahencryp.h +++ b/lib/dns/sec/dnssafe/ahencryp.h @@ -6,8 +6,8 @@ prohibited. */ -#ifndef _AHENCRYP_H_ -#define _AHENCRYP_H_ 1 +#ifndef DNSSAFE_AHENCRYP_H +#define DNSSAFE_AHENCRYP_H 1 #include "btypechk.h" @@ -82,4 +82,5 @@ void AHEncryptDecryptConstructor PROTO_LIST ((AHEncryptDecrypt *)); for B_TypeCheck, since this will just re-invoke this virtual destructor. */ -#endif +#endif /* DNSSAFE_AHENCRYP_H */ + diff --git a/lib/dns/sec/dnssafe/ahgen.h b/lib/dns/sec/dnssafe/ahgen.h index 7240e2e1f2..0ff23ec55e 100644 --- a/lib/dns/sec/dnssafe/ahgen.h +++ b/lib/dns/sec/dnssafe/ahgen.h @@ -6,8 +6,8 @@ prohibited. */ -#ifndef _AHGEN_H_ -#define _AHGEN_H_ 1 +#ifndef DNSSAFE_AHGEN_H +#define DNSSAFE_AHGEN_H 1 #include "btypechk.h" @@ -44,4 +44,5 @@ void AHGenerateConstructor PROTO_LIST ((AHGenerate *)); for B_TypeCheck, since this will just re-invoke this virtual destructor. */ -#endif +#endif /* DNSSAFE_AHGEN_H */ + diff --git a/lib/dns/sec/dnssafe/ahrandom.h b/lib/dns/sec/dnssafe/ahrandom.h index aeb4f3b01c..de878b2517 100644 --- a/lib/dns/sec/dnssafe/ahrandom.h +++ b/lib/dns/sec/dnssafe/ahrandom.h @@ -6,8 +6,8 @@ prohibited. */ -#ifndef _AHRANDOM_H_ -#define _AHRANDOM_H_ 1 +#ifndef DNSSAFE_AHRANDOM_H +#define DNSSAFE_AHRANDOM_H 1 #include "btypechk.h" @@ -44,4 +44,5 @@ void AHRandomConstructor PROTO_LIST ((AHRandom *)); for B_TypeCheck, since this will just re-invoke this virtual destructor. */ -#endif +#endif /* DNSSAFE_AHRANDOM_H */ + diff --git a/lib/dns/sec/dnssafe/ahrsaenc.h b/lib/dns/sec/dnssafe/ahrsaenc.h index ede21c7851..b8ab485294 100644 --- a/lib/dns/sec/dnssafe/ahrsaenc.h +++ b/lib/dns/sec/dnssafe/ahrsaenc.h @@ -6,8 +6,8 @@ prohibited. */ -#ifndef _AHRSAENC_H_ -#define _AHRSAENC_H_ +#ifndef DNSSAFE_AHRSAENC_H +#define DNSSAFE_AHRSAENC_H 1 #include "ahchencr.h" @@ -65,4 +65,5 @@ int AH_RSAEncryptionDecryptFinal PROTO_LIST ((THIS_ENCRYPT_DECRYPT *, unsigned char *, unsigned int *, unsigned int, B_Algorithm *, A_SURRENDER_CTX *)); -#endif +#endif /* DNSSAFE_AHRSAENC_H */ + diff --git a/lib/dns/sec/dnssafe/ahrsaepr.h b/lib/dns/sec/dnssafe/ahrsaepr.h index f5847bc636..0834a2e2cb 100644 --- a/lib/dns/sec/dnssafe/ahrsaepr.h +++ b/lib/dns/sec/dnssafe/ahrsaepr.h @@ -6,8 +6,8 @@ prohibited. */ -#ifndef _AHRSAEPR_H_ -#define _AHRSAEPR_H_ +#ifndef DNSSAFE_AHRSAEPR_H +#define DNSSAFE_AHRSAEPR_H 1 #include "ahrsaenc.h" @@ -17,4 +17,5 @@ typedef AH_RSAEncryption AH_RSAEncryptionPrivate; AH_RSAEncryptionPrivate *AH_RSAEncrypPrivateConstructor PROTO_LIST ((AH_RSAEncryptionPrivate *)); -#endif +#endif /* DNSSAFE_AHRSAEPR_H */ + diff --git a/lib/dns/sec/dnssafe/ahrsaepu.h b/lib/dns/sec/dnssafe/ahrsaepu.h index 0c13e204d7..aa37daed9c 100644 --- a/lib/dns/sec/dnssafe/ahrsaepu.h +++ b/lib/dns/sec/dnssafe/ahrsaepu.h @@ -6,8 +6,8 @@ prohibited. */ -#ifndef _AHRSAEPU_H_ -#define _AHRSAEPU_H_ +#ifndef DNSSAFE_AHRSAEPU_H +#define DNSSAFE_AHRSAEPU_H 1 #include "ahrsaenc.h" @@ -17,4 +17,5 @@ typedef AH_RSAEncryption AH_RSAEncryptionPublic; AH_RSAEncryptionPublic *AH_RSAEncrypPublicConstructor PROTO_LIST ((AH_RSAEncryptionPublic *)); -#endif +#endif /* DNSSAFE_AHRSAEPU_H */ + diff --git a/lib/dns/sec/dnssafe/aichdig.h b/lib/dns/sec/dnssafe/aichdig.h index e8228d911e..3ea11e1e9c 100644 --- a/lib/dns/sec/dnssafe/aichdig.h +++ b/lib/dns/sec/dnssafe/aichdig.h @@ -6,12 +6,13 @@ prohibited. */ -#ifndef _AICHDIG_H_ -#define _AICHDIG_H_ 1 +#ifndef DNSSAFE_AICHDIG_H +#define DNSSAFE_AICHDIG_H 1 #include "ainfotyp.h" #include "ainull.h" extern B_AlgorithmInfoTypeVTable AITChooseDigestNull_V_TABLE; -#endif +#endif /* DNSSAFE_AICHDIG_H */ + diff --git a/lib/dns/sec/dnssafe/aichenc8.h b/lib/dns/sec/dnssafe/aichenc8.h index 4c2096bd5f..a2ff06b55c 100644 --- a/lib/dns/sec/dnssafe/aichenc8.h +++ b/lib/dns/sec/dnssafe/aichenc8.h @@ -6,8 +6,8 @@ prohibited. */ -#ifndef _AICHENC8_H_ -#define _AICHENC8_H_ 1 +#ifndef DNSSAFE_AICHENC8_H +#define DNSSAFE_AICHENC8_H 1 #include "aichencr.h" @@ -16,4 +16,5 @@ extern B_AlgorithmInfoTypeVTable AITChooseEncrypt8_V_TABLE; int AIT_8AddInfo PROTO_LIST ((THIS_ALGORITHM_INFO_TYPE *, B_Algorithm *, POINTER)); -#endif +#endif /* DNSSAFE_AICHENC8_H */ + diff --git a/lib/dns/sec/dnssafe/aichencn.h b/lib/dns/sec/dnssafe/aichencn.h index 113015730f..ace47f41c6 100644 --- a/lib/dns/sec/dnssafe/aichencn.h +++ b/lib/dns/sec/dnssafe/aichencn.h @@ -6,12 +6,13 @@ prohibited. */ -#ifndef _AICHENCN_H_ -#define _AICHENCN_H_ 1 +#ifndef DNSSAFE_AICHENCN_H +#define DNSSAFE_AICHENCN_H 1 #include "aichencr.h" #include "ainull.h" extern B_AlgorithmInfoTypeVTable AITChooseEncryptNull_V_TABLE; -#endif +#endif /* DNSSAFE_AICHENCN_H */ + diff --git a/lib/dns/sec/dnssafe/aichencr.h b/lib/dns/sec/dnssafe/aichencr.h index 2d99bfb009..1367807638 100644 --- a/lib/dns/sec/dnssafe/aichencr.h +++ b/lib/dns/sec/dnssafe/aichencr.h @@ -6,12 +6,13 @@ prohibited. */ -#ifndef _AICHENCR_H_ -#define _AICHENCR_H_ 1 +#ifndef DNSSAFE_AICHENCR_H +#define DNSSAFE_AICHENCR_H 1 #include "ainfotyp.h" struct B_TypeCheck *AITChooseEncryptNewHandler PROTO_LIST ((B_AlgorithmInfoType *, B_Algorithm *)); -#endif +#endif /* DNSSAFE_AICHENCR_H */ + diff --git a/lib/dns/sec/dnssafe/aichgen.h b/lib/dns/sec/dnssafe/aichgen.h index eebd9b7261..e8a9b15c5f 100644 --- a/lib/dns/sec/dnssafe/aichgen.h +++ b/lib/dns/sec/dnssafe/aichgen.h @@ -6,12 +6,13 @@ prohibited. */ -#ifndef _AICHGEN_H_ -#define _AICHGEN_H_ 1 +#ifndef DNSSAFE_AICHGEN_H +#define DNSSAFE_AICHGEN_H 1 #include "ainfotyp.h" struct B_TypeCheck *AITChooseGenerateNewHandler PROTO_LIST ((B_AlgorithmInfoType *, B_Algorithm *)); -#endif +#endif /* DNSSAFE_AICHGEN_H */ + diff --git a/lib/dns/sec/dnssafe/aichrand.h b/lib/dns/sec/dnssafe/aichrand.h index 6f188e18ea..0751c233f5 100644 --- a/lib/dns/sec/dnssafe/aichrand.h +++ b/lib/dns/sec/dnssafe/aichrand.h @@ -6,12 +6,13 @@ prohibited. */ -#ifndef _AICHRAND_H_ -#define _AICHRAND_H_ 1 +#ifndef DNSSAFE_AICHRAND_H +#define DNSSAFE_AICHRAND_H 1 #include "ainfotyp.h" #include "ainull.h" extern B_AlgorithmInfoTypeVTable AITChooseRandomNull_V_TABLE; -#endif +#endif /* DNSSAFE_AICHRAND_H */ + diff --git a/lib/dns/sec/dnssafe/ainfotyp.h b/lib/dns/sec/dnssafe/ainfotyp.h index fa9f4a6476..5ba10fceaf 100644 --- a/lib/dns/sec/dnssafe/ainfotyp.h +++ b/lib/dns/sec/dnssafe/ainfotyp.h @@ -6,8 +6,8 @@ prohibited. */ -#ifndef _AINFOTYP_H_ -#define _AINFOTYP_H_ 1 +#ifndef DNSSAFE_AINFOTYP_H +#define DNSSAFE_AINFOTYP_H 1 /* Use the THIS_ALGORITHM_INFO_TYPE macro to define the type of object in the virtual function prototype. It defaults to the most base class, but @@ -36,4 +36,5 @@ typedef struct B_AlgorithmInfoType { int B_AlgorithmInfoTypeMakeError PROTO_LIST ((THIS_ALGORITHM_INFO_TYPE *, POINTER *, B_Algorithm *)); -#endif +#endif /* DNSSAFE_AINFOTYP_H */ + diff --git a/lib/dns/sec/dnssafe/ainull.h b/lib/dns/sec/dnssafe/ainull.h index 3b48901a0a..c68e1bde49 100644 --- a/lib/dns/sec/dnssafe/ainull.h +++ b/lib/dns/sec/dnssafe/ainull.h @@ -6,5 +6,10 @@ prohibited. */ +#ifndef DNSSAFE_AINULL_H +#define DNSSAFE_AINULL_H 1 + int AITNullAddInfo PROTO_LIST ((THIS_ALGORITHM_INFO_TYPE *, B_Algorithm *, POINTER)); + +#endif /* DNSSAFE_AINULL_H */ diff --git a/lib/dns/sec/dnssafe/algae.h b/lib/dns/sec/dnssafe/algae.h index f1ceb62d85..ee76fc7893 100644 --- a/lib/dns/sec/dnssafe/algae.h +++ b/lib/dns/sec/dnssafe/algae.h @@ -6,8 +6,8 @@ prohibited. */ -#ifndef _ALGAE_H_ -#define _ALGAE_H_ 1 +#ifndef DNSSAFE_ALGAE_H +#define DNSSAFE_ALGAE_H 1 #ifndef T_CALL #define T_CALL @@ -63,4 +63,5 @@ unsigned int A_IntegerBits PROTO_LIST ((unsigned char *, unsigned int)); } #endif -#endif +#endif /* DNSSAFE_ALGAE_H */ + diff --git a/lib/dns/sec/dnssafe/algchoic.h b/lib/dns/sec/dnssafe/algchoic.h index 5743441d45..605b59b7f9 100644 --- a/lib/dns/sec/dnssafe/algchoic.h +++ b/lib/dns/sec/dnssafe/algchoic.h @@ -6,8 +6,8 @@ prohibited. */ -#ifndef _ALGCHOICE_H_ -#define _ALGCHOICE_H_ 1 +#ifndef DNSSAFE_ALGCHOIC_H +#define DNSSAFE_ALGCHOIC_H 1 #define IS_FATAL_BSAFE_ERROR(status) \ (status == BE_ALLOC || status == BE_HARDWARE || status == BE_CANCEL) @@ -108,4 +108,4 @@ int AlgaChoiceChoose PROTO_LIST int ConvertAlgaeError PROTO_LIST ((int)); -#endif +#endif /* DNSSAFE_ALGCHOIC_H */ diff --git a/lib/dns/sec/dnssafe/algobj.h b/lib/dns/sec/dnssafe/algobj.h index 7f87cfae74..3925478a06 100644 --- a/lib/dns/sec/dnssafe/algobj.h +++ b/lib/dns/sec/dnssafe/algobj.h @@ -6,6 +6,9 @@ prohibited. */ +#ifndef DNSSAFE_ALGOBJ_H +#define DNSSAFE_ALGOBJ_H 1 + #define THE_ALG_WRAP ((AlgorithmWrap *)algorithmObject) typedef struct AlgorithmWrap { @@ -17,3 +20,4 @@ typedef struct AlgorithmWrap { int AlgorithmWrapCheck PROTO_LIST ((AlgorithmWrap *)); int RandomAlgorithmCheck PROTO_LIST ((B_ALGORITHM_OBJ)); +#endif /* DNSSAFE_ALGOBJ_H */ diff --git a/lib/dns/sec/dnssafe/amdigest.h b/lib/dns/sec/dnssafe/amdigest.h index 5b8f56620b..7c4c19aabc 100644 --- a/lib/dns/sec/dnssafe/amdigest.h +++ b/lib/dns/sec/dnssafe/amdigest.h @@ -6,6 +6,9 @@ prohibited. */ +#ifndef DNSSAFE_AMDIGEST_H +#define DNSSAFE_AMDIGEST_H 1 + typedef struct { int (*Query) PROTO_LIST ((unsigned int *, POINTER)); int (*Init) PROTO_LIST ((POINTER, POINTER, A_SURRENDER_CTX *)); @@ -17,3 +20,4 @@ typedef struct { int (*GetMaxOutputLen) PROTO_LIST ((POINTER, unsigned int *)); } A_DIGEST_ALGA; +#endif /* DNSSAFE_AMDIGEST_H */ diff --git a/lib/dns/sec/dnssafe/amencdec.h b/lib/dns/sec/dnssafe/amencdec.h index 8f91a0fab3..4c5d9d82f5 100644 --- a/lib/dns/sec/dnssafe/amencdec.h +++ b/lib/dns/sec/dnssafe/amencdec.h @@ -6,6 +6,9 @@ prohibited. */ +#ifndef DNSSAFE_AMENCDEC_H +#define DNSSAFE_AMENCDEC_H 1 + typedef struct { int (*Query) PROTO_LIST ((unsigned int *, POINTER, POINTER)); int (*Init) PROTO_LIST ((POINTER, POINTER, POINTER, A_SURRENDER_CTX *)); @@ -19,3 +22,4 @@ typedef struct { int (*GetBlockLen) PROTO_LIST ((POINTER, unsigned int *)); } A_ENCRYPT_DECRYPT_ALGA; +#endif /* DNSSAFE_AMENCDEC_H */ diff --git a/lib/dns/sec/dnssafe/amgen.h b/lib/dns/sec/dnssafe/amgen.h index ffdf45765c..7a45af2f09 100644 --- a/lib/dns/sec/dnssafe/amgen.h +++ b/lib/dns/sec/dnssafe/amgen.h @@ -6,6 +6,9 @@ prohibited. */ +#ifndef DNSSAFE_AMGEN_H +#define DNSSAFE_AMGEN_H 1 + struct B_KeyInfoType; typedef struct { @@ -17,3 +20,4 @@ typedef struct { ((POINTER, POINTER *, unsigned char *, A_SURRENDER_CTX *)); } A_GENERATE_ALGA; +#endif /* DNSSAFE_AMGEN_H */ diff --git a/lib/dns/sec/dnssafe/amrandom.h b/lib/dns/sec/dnssafe/amrandom.h index 3b9539a049..98a779e40a 100644 --- a/lib/dns/sec/dnssafe/amrandom.h +++ b/lib/dns/sec/dnssafe/amrandom.h @@ -6,6 +6,9 @@ prohibited. */ +#ifndef DNSSAFE_AMRANDOM_H +#define DNSSAFE_AMRANDOM_H 1 + typedef struct { int (*Query) PROTO_LIST ((unsigned int *, POINTER)); int (*Init) PROTO_LIST ((POINTER, POINTER, A_SURRENDER_CTX *)); @@ -15,3 +18,4 @@ typedef struct { ((POINTER, unsigned char *, unsigned int, A_SURRENDER_CTX *)); } A_RANDOM_ALGA; +#endif /* DNSSAFE_AMRANDOM_H */ diff --git a/lib/dns/sec/dnssafe/atypes.h b/lib/dns/sec/dnssafe/atypes.h index e1af4eac3e..c83980ff09 100644 --- a/lib/dns/sec/dnssafe/atypes.h +++ b/lib/dns/sec/dnssafe/atypes.h @@ -6,8 +6,8 @@ prohibited. */ -#ifndef _ATYPES_H_ -#define _ATYPES_H_ 1 +#ifndef DNSSAFE_ATYPES_H +#define DNSSAFE_ATYPES_H 1 #ifdef __cplusplus extern "C" { @@ -57,4 +57,5 @@ typedef struct { } #endif -#endif +#endif /* DNSSAFE_ATYPES_H */ + diff --git a/lib/dns/sec/dnssafe/balg.h b/lib/dns/sec/dnssafe/balg.h index fdbc269b26..1dfb8963fa 100644 --- a/lib/dns/sec/dnssafe/balg.h +++ b/lib/dns/sec/dnssafe/balg.h @@ -6,8 +6,8 @@ prohibited. */ -#ifndef _BALG_H_ -#define _BALG_H_ 1 +#ifndef DNSSAFE_BALG_H +#define DNSSAFE_BALG_H 1 #include "binfocsh.h" #include "btypechk.h" @@ -113,4 +113,5 @@ int B_AlgorithmGenerateKeypair PROTO_LIST int B_AlgorithmGenerateParameters PROTO_LIST ((B_Algorithm *, B_Algorithm *, B_Algorithm *, A_SURRENDER_CTX *)); -#endif +#endif /* DNSSAFE_BALG_H */ + diff --git a/lib/dns/sec/dnssafe/balgmeth.h b/lib/dns/sec/dnssafe/balgmeth.h index c73e3ad42e..228f522c15 100644 --- a/lib/dns/sec/dnssafe/balgmeth.h +++ b/lib/dns/sec/dnssafe/balgmeth.h @@ -6,6 +6,9 @@ prohibited. */ +#ifndef DNSSAFE_BALGMETH_H +#define DNSSAFE_BALGMETH_H 1 + struct B_AlgorithmInfoType; struct B_KeyInfoType; @@ -16,3 +19,4 @@ struct B_ALGORITHM_METHOD { POINTER alga; }; +#endif /* DNSSAFE_BALGMETH_H */ diff --git a/lib/dns/sec/dnssafe/bigmath.h b/lib/dns/sec/dnssafe/bigmath.h index 351b55b225..baa782ea23 100644 --- a/lib/dns/sec/dnssafe/bigmath.h +++ b/lib/dns/sec/dnssafe/bigmath.h @@ -6,8 +6,8 @@ prohibited. */ -#ifndef _BIGMATH_H_ -#define _BIGMATH_H_ 1 +#ifndef DNSSAFE_BIGMATH_H +#define DNSSAFE_BIGMATH_H 1 #include "algae.h" #include "bigmaxes.h" @@ -68,4 +68,5 @@ int CanonicalToBig PROTO_LIST } #endif -#endif +#endif /* DNSSAFE_BIGMATH_H */ + diff --git a/lib/dns/sec/dnssafe/bigmaxes.h b/lib/dns/sec/dnssafe/bigmaxes.h index 49992f671c..9dbb3aed41 100644 --- a/lib/dns/sec/dnssafe/bigmaxes.h +++ b/lib/dns/sec/dnssafe/bigmaxes.h @@ -6,8 +6,8 @@ prohibited. */ -#ifndef _BIGMAXES_H_ -#define _BIGMAXES_H_ 1 +#ifndef DNSSAFE_BIGMAXES_H +#define DNSSAFE_BIGMAXES_H 1 #ifdef __cplusplus extern "C" { @@ -44,4 +44,5 @@ extern "C" { } #endif -#endif +#endif /* DNSSAFE_BIGMAXES_H */ + diff --git a/lib/dns/sec/dnssafe/binfocsh.h b/lib/dns/sec/dnssafe/binfocsh.h index 32778765db..6bd68493c6 100644 --- a/lib/dns/sec/dnssafe/binfocsh.h +++ b/lib/dns/sec/dnssafe/binfocsh.h @@ -6,8 +6,8 @@ prohibited. */ -#ifndef _BINFOCSH_H_ -#define _BINFOCSH_H_ 1 +#ifndef DNSSAFE_BINFOCSH_H +#define DNSSAFE_BINFOCSH_H 1 #include "bmempool.h" @@ -30,4 +30,5 @@ void B_InfoCacheConstructor PROTO_LIST ((B_InfoCache *)); int B_InfoCacheAddInfo PROTO_LIST ((B_InfoCache *, POINTER, POINTER)); int B_InfoCacheFindInfo PROTO_LIST ((B_InfoCache *, POINTER *, POINTER)); -#endif +#endif /* DNSSAFE_BINFOCSH_H */ + diff --git a/lib/dns/sec/dnssafe/bkey.h b/lib/dns/sec/dnssafe/bkey.h index bfcaca7ac4..5ea9b58141 100644 --- a/lib/dns/sec/dnssafe/bkey.h +++ b/lib/dns/sec/dnssafe/bkey.h @@ -6,8 +6,8 @@ prohibited. */ -#ifndef _BKEY_H_ -#define _BKEY_H_ 1 +#ifndef DNSSAFE_BKEY_H +#define DNSSAFE_BKEY_H 1 #include "binfocsh.h" @@ -29,4 +29,5 @@ int B_KeySetInfo PROTO_LIST ((B_Key *, struct B_KeyInfoType *, POINTER)); int B_KeyGetInfo PROTO_LIST ((B_Key *, POINTER *, struct B_KeyInfoType *)); int B_KeyAddItemInfo PROTO_LIST ((B_Key *, unsigned char *, unsigned int)); -#endif +#endif /* DNSSAFE_BKEY_H */ + diff --git a/lib/dns/sec/dnssafe/bmempool.h b/lib/dns/sec/dnssafe/bmempool.h index b5216dd2f2..6f87e17876 100644 --- a/lib/dns/sec/dnssafe/bmempool.h +++ b/lib/dns/sec/dnssafe/bmempool.h @@ -6,8 +6,8 @@ prohibited. */ -#ifndef _BMEMPOOL_H_ -#define _BMEMPOOL_H_ 1 +#ifndef DNSSAFE_BMEMPOOL_H +#define DNSSAFE_BMEMPOOL_H 1 typedef void (*B_MEMORY_POOL_DELETE_FUNCTION) PROTO_LIST ((POINTER)); @@ -50,4 +50,5 @@ B_ALLOCED_DATA *B_MemoryPoolFindAllocedObject PROTO_LIST int B_MemoryPoolAdoptHelper PROTO_LIST ((B_MemoryPool *, POINTER, unsigned int, B_MEMORY_POOL_DELETE_FUNCTION)); -#endif +#endif /* DNSSAFE_BMEMPOOL_H */ + diff --git a/lib/dns/sec/dnssafe/bsafe2.h b/lib/dns/sec/dnssafe/bsafe2.h index 4eb4ef5551..a3a51d05c1 100644 --- a/lib/dns/sec/dnssafe/bsafe2.h +++ b/lib/dns/sec/dnssafe/bsafe2.h @@ -6,8 +6,8 @@ prohibited. */ -#ifndef _BSAFE_H_ -#define _BSAFE_H_ 1 +#ifndef DNSSAFE_BSAFE2_H +#define DNSSAFE_BSAFE2_H 1 #ifndef T_CALL #define T_CALL @@ -191,4 +191,5 @@ extern B_ALGORITHM_METHOD T_CALL AM_RSA_KEY_GEN; } #endif -#endif +#endif /* DNSSAFE_BSAFE2_H */ + diff --git a/lib/dns/sec/dnssafe/btypechk.h b/lib/dns/sec/dnssafe/btypechk.h index 93f5a97bac..e171fd64da 100644 --- a/lib/dns/sec/dnssafe/btypechk.h +++ b/lib/dns/sec/dnssafe/btypechk.h @@ -6,8 +6,8 @@ prohibited. */ -#ifndef _BTYPECHK_H_ -#define _BTYPECHK_H_ 1 +#ifndef DNSSAFE_BTYPECHK_H +#define DNSSAFE_BTYPECHK_H 1 struct B_TypeCheck; @@ -22,4 +22,5 @@ typedef struct B_TypeCheck { #define B_TYPE_CHECK_Destructor(typeCheck)\ (*(typeCheck)->_Destructor) (typeCheck) -#endif +#endif /* DNSSAFE_BTYPECHK_H */ + diff --git a/lib/dns/sec/dnssafe/crt2.h b/lib/dns/sec/dnssafe/crt2.h index 4c5c0f7da1..2ead317b10 100644 --- a/lib/dns/sec/dnssafe/crt2.h +++ b/lib/dns/sec/dnssafe/crt2.h @@ -6,8 +6,8 @@ prohibited. */ -#ifndef _RSA_H_ -#define _RSA_H_ 1 +#ifndef DNSSAFE_CRT2_H +#define DNSSAFE_CRT2_H 1 #include "bigmaxes.h" @@ -47,4 +47,4 @@ void A_RSA_CRT2GetMaxOutputLen PROTO_LIST } #endif -#endif +#endif /* DNSSAFE_CRT2_H */ diff --git a/lib/dns/sec/dnssafe/digrand.h b/lib/dns/sec/dnssafe/digrand.h index 6753c9cfab..493dd87c4d 100644 --- a/lib/dns/sec/dnssafe/digrand.h +++ b/lib/dns/sec/dnssafe/digrand.h @@ -6,8 +6,8 @@ prohibited. */ -#ifndef _DIGRAND_H_ -#define _DIGRAND_H_ 1 +#ifndef DNSSAFE_DIGRAND_H +#define DNSSAFE_DIGRAND_H 1 #ifdef __cplusplus extern "C" { @@ -50,4 +50,5 @@ void A_DigestRandomGenerateBytes PROTO_LIST } #endif -#endif +#endif /* DNSSAFE_DIGRAND_H */ + diff --git a/lib/dns/sec/dnssafe/global.h b/lib/dns/sec/dnssafe/global.h index 0545dca0cd..35dcb08bfb 100644 --- a/lib/dns/sec/dnssafe/global.h +++ b/lib/dns/sec/dnssafe/global.h @@ -6,8 +6,8 @@ prohibited. */ -#ifndef _GLOBAL_H_ -#define _GLOBAL_H_ 1 +#ifndef DNSSAFE_GLOBAL_H +#define DNSSAFE_GLOBAL_H 1 #include "../rename-dnssafe.h" @@ -59,4 +59,5 @@ typedef isc_uint32_t UINT4; } #endif -#endif /* end _GLOBAL_H_ */ +#endif /* DNSSAFE_GLOBAL_H */ + diff --git a/lib/dns/sec/dnssafe/intitem.h b/lib/dns/sec/dnssafe/intitem.h index 05cb2fc14a..a0062d4b4a 100644 --- a/lib/dns/sec/dnssafe/intitem.h +++ b/lib/dns/sec/dnssafe/intitem.h @@ -6,6 +6,10 @@ prohibited. */ +#ifndef DNSSAFE_INTITEM_H +#define DNSSAFE_INTITEM_H 1 + int AllocAndCopyIntegerItems PROTO_LIST ((POINTER, POINTER, POINTER, ITEM **, unsigned int, B_MemoryPool *)); +#endif /* DNSSAFE_INTITEM_H */ diff --git a/lib/dns/sec/dnssafe/keyobj.h b/lib/dns/sec/dnssafe/keyobj.h index b7f582f8da..9a75b01244 100644 --- a/lib/dns/sec/dnssafe/keyobj.h +++ b/lib/dns/sec/dnssafe/keyobj.h @@ -6,6 +6,9 @@ prohibited. */ +#ifndef DNSSAFE_KEYOBJ_H +#define DNSSAFE_KEYOBJ_H 1 + typedef struct KeyWrap { B_Key key; char *typeTag; @@ -14,3 +17,4 @@ typedef struct KeyWrap { int KeyWrapCheck PROTO_LIST ((KeyWrap *)); +#endif /* DNSSAFE_KEYOBJ_H */ diff --git a/lib/dns/sec/dnssafe/ki8byte.h b/lib/dns/sec/dnssafe/ki8byte.h index 1c78bb12d4..8ef0b844f0 100644 --- a/lib/dns/sec/dnssafe/ki8byte.h +++ b/lib/dns/sec/dnssafe/ki8byte.h @@ -6,4 +6,9 @@ prohibited. */ +#ifndef DNSSAFE_KI8BYTE_H +#define DNSSAFE_KI8BYTE_H 1 + extern B_KeyInfoType KIT_8Byte; + +#endif /* DNSSAFE_KI8BYTE_H */ diff --git a/lib/dns/sec/dnssafe/kifulprv.h b/lib/dns/sec/dnssafe/kifulprv.h index 8e469ce9f3..ccc8eee9af 100644 --- a/lib/dns/sec/dnssafe/kifulprv.h +++ b/lib/dns/sec/dnssafe/kifulprv.h @@ -6,7 +6,12 @@ prohibited. */ +#ifndef DNSSAFE_KIFULPRV_H +#define DNSSAFE_KIFULPRV_H 1 + int CacheFullPrivateKey PROTO_LIST ((B_Key *, ITEM *, ITEM *, ITEM *, ITEM *, ITEM *, ITEM *)); int GetFullPrivateKeyInfo PROTO_LIST ((ITEM *, ITEM *, ITEM *, ITEM *, ITEM *, ITEM *, B_Key *)); + +#endif /* DNSSAFE_KIFULPRV_H */ diff --git a/lib/dns/sec/dnssafe/kiitem.h b/lib/dns/sec/dnssafe/kiitem.h index ab80ceee63..c97a23cc39 100644 --- a/lib/dns/sec/dnssafe/kiitem.h +++ b/lib/dns/sec/dnssafe/kiitem.h @@ -6,4 +6,9 @@ prohibited. */ +#ifndef DNSSAFE_KIITEM_H +#define DNSSAFE_KIITEM_H 1 + extern B_KeyInfoType KITItem; + +#endif /* DNSSAFE_KIITEM_H */ diff --git a/lib/dns/sec/dnssafe/kinfotyp.h b/lib/dns/sec/dnssafe/kinfotyp.h index 3f6ce7c152..39c5292c6c 100644 --- a/lib/dns/sec/dnssafe/kinfotyp.h +++ b/lib/dns/sec/dnssafe/kinfotyp.h @@ -6,6 +6,9 @@ prohibited. */ +#ifndef DNSSAFE_KINFOTYP_H +#define DNSSAFE_KINFOTYP_H 1 + typedef int (*KIT_ADD_INFO) PROTO_LIST ((B_Key *, POINTER)); typedef int (*KIT_MAKE_INFO) PROTO_LIST ((POINTER *, B_Key *)); @@ -55,3 +58,5 @@ typedef struct B_KeyInfoType { } B_KeyInfoType; int B_KeyInfoTypeMakeError PROTO_LIST ((POINTER *, B_Key *)); + +#endif /* DNSSAFE_KINFOTYP_H */ diff --git a/lib/dns/sec/dnssafe/kipkcrpr.h b/lib/dns/sec/dnssafe/kipkcrpr.h index 9bcfc02d4c..bcb7eaf491 100644 --- a/lib/dns/sec/dnssafe/kipkcrpr.h +++ b/lib/dns/sec/dnssafe/kipkcrpr.h @@ -6,8 +6,12 @@ prohibited. */ +#ifndef DNSSAFE_KIPKCRPR_H +#define DNSSAFE_KIPKCRPR_H 1 + extern B_KeyInfoType KIT_PKCS_RSAPrivate; int KIT_PKCS_RSAPrivateAddInfo PROTO_LIST ((B_Key *, POINTER)); int KIT_PKCS_RSAPrivateMakeInfo PROTO_LIST ((POINTER *, B_Key *)); +#endif /* DNSSAFE_KIPKCRPR_H */ diff --git a/lib/dns/sec/dnssafe/kirsapub.h b/lib/dns/sec/dnssafe/kirsapub.h index 485fd79a77..548b40ecfc 100644 --- a/lib/dns/sec/dnssafe/kirsapub.h +++ b/lib/dns/sec/dnssafe/kirsapub.h @@ -6,8 +6,12 @@ prohibited. */ +#ifndef DNSSAFE_KIRSAPUB_H +#define DNSSAFE_KIRSAPUB_H 1 + extern B_KeyInfoType KIT_RSAPublic; int KIT_RSAPublicAddInfo PROTO_LIST ((B_Key *, POINTER)); int KIT_RSAPublicMakeInfo PROTO_LIST ((POINTER *, B_Key *)); +#endif /* DNSSAFE_KIRSAPUB_H */ diff --git a/lib/dns/sec/dnssafe/md5.h b/lib/dns/sec/dnssafe/md5.h index f770a07336..0abec03781 100644 --- a/lib/dns/sec/dnssafe/md5.h +++ b/lib/dns/sec/dnssafe/md5.h @@ -6,8 +6,8 @@ prohibited. */ -#ifndef _MD5_H_ -#define _MD5_H_ 1 +#ifndef DNSSAFE_MD5_H +#define DNSSAFE_MD5_H 1 #ifdef __cplusplus extern "C" { @@ -29,4 +29,5 @@ void A_MD5Final PROTO_LIST ((A_MD5_CTX *, unsigned char *)); } #endif -#endif +#endif /* DNSSAFE_MD5_H */ + diff --git a/lib/dns/sec/dnssafe/md5rand.h b/lib/dns/sec/dnssafe/md5rand.h index f197410695..dc0b20ae41 100644 --- a/lib/dns/sec/dnssafe/md5rand.h +++ b/lib/dns/sec/dnssafe/md5rand.h @@ -6,8 +6,8 @@ prohibited. */ -#ifndef _MD5RAND_H_ -#define _MD5RAND_H_ 1 +#ifndef DNSSAFE_MD5RAND_H +#define DNSSAFE_MD5RAND_H 1 #include "digrand.h" #include "md5.h" @@ -33,4 +33,5 @@ void A_MD5RandomGenerateBytes PROTO_LIST } #endif -#endif +#endif /* DNSSAFE_MD5RAND_H */ + diff --git a/lib/dns/sec/dnssafe/prime.h b/lib/dns/sec/dnssafe/prime.h index e922f36abd..774846754b 100644 --- a/lib/dns/sec/dnssafe/prime.h +++ b/lib/dns/sec/dnssafe/prime.h @@ -6,8 +6,8 @@ prohibited. */ -#ifndef _PRIME_H_ -#define _PRIME_H_ 1 +#ifndef DNSSAFE_PRIME_H +#define DNSSAFE_PRIME_H 1 #ifdef __cplusplus extern "C" { @@ -23,4 +23,5 @@ int PseudoPrime PROTO_LIST } #endif -#endif +#endif /* DNSSAFE_PRIME_H */ + diff --git a/lib/dns/sec/dnssafe/rsa.h b/lib/dns/sec/dnssafe/rsa.h index 2d86099a85..63cf788b9f 100644 --- a/lib/dns/sec/dnssafe/rsa.h +++ b/lib/dns/sec/dnssafe/rsa.h @@ -6,8 +6,8 @@ prohibited. */ -#ifndef _RSA_H_ -#define _RSA_H_ 1 +#ifndef DNSSAFE_RSA_H +#define DNSSAFE_RSA_H 1 #include "bigmaxes.h" @@ -41,4 +41,5 @@ int A_RSAFinal PROTO_LIST ((A_RSA_CTX *)); } #endif -#endif +#endif /* DNSSAFE_RSA_H */ + diff --git a/lib/dns/sec/dnssafe/rsakeygn.h b/lib/dns/sec/dnssafe/rsakeygn.h index ba40b86486..d36371608c 100644 --- a/lib/dns/sec/dnssafe/rsakeygn.h +++ b/lib/dns/sec/dnssafe/rsakeygn.h @@ -6,8 +6,8 @@ prohibited. */ -#ifndef _RSAKEYGN_H_ -#define _RSAKEYGN_H_ 1 +#ifndef DNSSAFE_RSAKEYGN_H +#define DNSSAFE_RSAKEYGN_H 1 #include "bigmaxes.h" @@ -50,5 +50,6 @@ int A_RSAKeyGen PROTO_LIST } #endif -#endif +#endif /* DNSSAFE_RSAKEYGN_H */ + diff --git a/lib/dns/sec/dnssafe/secrcbc.h b/lib/dns/sec/dnssafe/secrcbc.h index 122f83f5b8..fb55230713 100644 --- a/lib/dns/sec/dnssafe/secrcbc.h +++ b/lib/dns/sec/dnssafe/secrcbc.h @@ -6,8 +6,8 @@ prohibited. */ -#ifndef _SECRCBC_H_ -#define _SECRCBC_H_ 1 +#ifndef DNSSAFE_SECRCBC_H +#define DNSSAFE_SECRCBC_H 1 #ifdef __cplusplus extern "C" { @@ -33,4 +33,5 @@ int SecretCBCDecryptFinal PROTO_LIST } #endif -#endif +#endif /* DNSSAFE_SECRCBC_H */ + diff --git a/lib/dns/sec/dnssafe/surrendr.h b/lib/dns/sec/dnssafe/surrendr.h index dc929046aa..179cda2690 100644 --- a/lib/dns/sec/dnssafe/surrendr.h +++ b/lib/dns/sec/dnssafe/surrendr.h @@ -6,8 +6,8 @@ prohibited. */ -#ifndef _SURRENDR_H_ -#define _SURRENDR_H_ 1 +#ifndef DNSSAFE_SURRENDR_H +#define DNSSAFE_SURRENDR_H 1 #ifdef __cplusplus extern "C" { @@ -19,4 +19,5 @@ int CheckSurrender PROTO_LIST ((A_SURRENDER_CTX *)); } #endif -#endif +#endif /* DNSSAFE_SURRENDR_H */ + diff --git a/lib/dns/sec/dst/dst_internal.h b/lib/dns/sec/dst/dst_internal.h index 62696c00aa..bbe108d508 100644 --- a/lib/dns/sec/dst/dst_internal.h +++ b/lib/dns/sec/dst/dst_internal.h @@ -1,6 +1,3 @@ -#ifndef DST_INTERNAL_H -#define DST_INTERNAL_H - /* * Portions Copyright (c) 1995-1998 by Trusted Information Systems, Inc. * @@ -17,6 +14,10 @@ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION * WITH THE USE OR PERFORMANCE OF THE SOFTWARE. */ + +#ifndef DST_DST_INTERNAL_H +#define DST_DST_INTERNAL_H 1 + #include #include #include @@ -123,4 +124,4 @@ void * dst_mem_realloc(void *ptr, size_t size); ISC_LANG_ENDDECLS -#endif /* DST_INTERNAL_H */ +#endif /* DST_DST_INTERNAL_H */ diff --git a/lib/dns/sec/dst/dst_parse.h b/lib/dns/sec/dst/dst_parse.h index a431fc98df..dd32b9cf03 100644 --- a/lib/dns/sec/dst/dst_parse.h +++ b/lib/dns/sec/dst/dst_parse.h @@ -1,6 +1,3 @@ -#ifndef DST_PARSE_H -#define DST_PARSE_H - /* * Portions Copyright (c) 1995-1998 by Trusted Information Systems, Inc. * @@ -17,6 +14,9 @@ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION * WITH THE USE OR PERFORMANCE OF THE SOFTWARE. */ +#ifndef DST_DST_PARSE_H +#define DST_DST_PARSE_H 1 + #include #include #include @@ -85,4 +85,4 @@ int dst_s_write_private_key_file(const char *name, const int alg, ISC_LANG_ENDDECLS -#endif /* DST_PARSE_H */ +#endif /* DST_DST_PARSE_H */ diff --git a/lib/dns/sec/openssl/bn_asm.c b/lib/dns/sec/openssl/bn_asm.c index 2bc0c32e0c..7fbb68a53c 100644 --- a/lib/dns/sec/openssl/bn_asm.c +++ b/lib/dns/sec/openssl/bn_asm.c @@ -434,6 +434,7 @@ BN_ULONG bn_sub_words(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n) #undef bn_sqr_comba8 #undef bn_sqr_comba4 +#undef SEC_RENAME_H /* force multiple inclusion */ #include "../rename.h" /* mul_add_c(a,b,c0,c1,c2) -- c+=a*b for three word number c=(c2,c1,c0) */ diff --git a/lib/dns/sec/openssl/bn_lcl.h b/lib/dns/sec/openssl/bn_lcl.h index e09211dc87..63f3042213 100644 --- a/lib/dns/sec/openssl/bn_lcl.h +++ b/lib/dns/sec/openssl/bn_lcl.h @@ -56,8 +56,8 @@ * [including the GNU Public Licence.] */ -#ifndef HEADER_BN_LCL_H -#define HEADER_BN_LCL_H +#ifndef OPENSSL_BN_LCL_H +#define OPENSSL_BN_LCL_H 1 #include @@ -258,4 +258,4 @@ void bn_mul_high(BN_ULONG *r,BN_ULONG *a,BN_ULONG *b,BN_ULONG *l,int n2, } #endif -#endif +#endif /* OPENSSL_BN_LCL_H */ diff --git a/lib/dns/sec/openssl/bn_prime.h b/lib/dns/sec/openssl/bn_prime.h index 6fce0210cd..d63e3daca0 100644 --- a/lib/dns/sec/openssl/bn_prime.h +++ b/lib/dns/sec/openssl/bn_prime.h @@ -56,6 +56,9 @@ * [including the GNU Public Licence.] */ +#ifndef OPENSSL_BN_PRIME_H +#define OPENSSL_BN_PRIME_H 1 + #ifndef EIGHT_BIT #define NUMPRIMES 2048 #else @@ -323,3 +326,5 @@ static unsigned int primes[NUMPRIMES]= 17789,17791,17807,17827,17837,17839,17851,17863, #endif }; + +#endif /* OPENSSL_BN_PRIME_H */ diff --git a/lib/dns/sec/openssl/cryptlib.h b/lib/dns/sec/openssl/cryptlib.h index e3d38524ae..de6c17b9bf 100644 --- a/lib/dns/sec/openssl/cryptlib.h +++ b/lib/dns/sec/openssl/cryptlib.h @@ -56,8 +56,8 @@ * [including the GNU Public Licence.] */ -#ifndef HEADER_CRYPTLIB_H -#define HEADER_CRYPTLIB_H +#ifndef OPENSSL_CRYPTLIB_H +#define OPENSSL_CRYPTLIB_H 1 #include #include @@ -93,4 +93,4 @@ extern "C" { } #endif -#endif +#endif /* OPENSSL_CRYPTLIB_H */ diff --git a/lib/dns/sec/openssl/include/openssl/bio.h b/lib/dns/sec/openssl/include/openssl/bio.h index c41db123a5..23d702530f 100644 --- a/lib/dns/sec/openssl/include/openssl/bio.h +++ b/lib/dns/sec/openssl/include/openssl/bio.h @@ -56,8 +56,8 @@ * [including the GNU Public Licence.] */ -#ifndef HEADER_BIO_H -#define HEADER_BIO_H +#ifndef OPENSSL_BIO_H +#define OPENSSL_BIO_H 1 #ifdef __cplusplus extern "C" { @@ -592,5 +592,4 @@ int BIO_printf(BIO *bio, ...); #ifdef __cplusplus } #endif -#endif - +#endif /* OPENSSL_BIO_H */ diff --git a/lib/dns/sec/openssl/include/openssl/bn.h b/lib/dns/sec/openssl/include/openssl/bn.h index 2bddfeb816..d315783057 100644 --- a/lib/dns/sec/openssl/include/openssl/bn.h +++ b/lib/dns/sec/openssl/include/openssl/bn.h @@ -56,8 +56,8 @@ * [including the GNU Public Licence.] */ -#ifndef HEADER_BN_H -#define HEADER_BN_H +#ifndef OPENSSL_BN_H +#define OPENSSL_BN_H 1 #ifndef WIN16 #include /* FILE */ @@ -379,7 +379,7 @@ int BN_mod_mul(BIGNUM *ret, BIGNUM *a, BIGNUM *b, const BIGNUM *m, BN_CTX *ctx); #ifndef NO_FP_API int BN_print_fp(FILE *fp, const BIGNUM *a); #endif -#ifdef HEADER_BIO_H +#ifdef OPENSSL_BIO_H int BN_print(BIO *fp, const BIGNUM *a); #else int BN_print(void *fp, const BIGNUM *a); @@ -512,5 +512,5 @@ BN_ULONG bn_sub_words(BN_ULONG *rp, BN_ULONG *ap, BN_ULONG *bp,int num); #ifdef __cplusplus } #endif -#endif +#endif /* OPENSSL_BN_H */ diff --git a/lib/dns/sec/openssl/include/openssl/buffer.h b/lib/dns/sec/openssl/include/openssl/buffer.h index bff26bf391..247c8ee62e 100644 --- a/lib/dns/sec/openssl/include/openssl/buffer.h +++ b/lib/dns/sec/openssl/include/openssl/buffer.h @@ -56,8 +56,8 @@ * [including the GNU Public Licence.] */ -#ifndef HEADER_BUFFER_H -#define HEADER_BUFFER_H +#ifndef OPENSSL_BUFFER_H +#define OPENSSL_BUFFER_H 1 #ifdef __cplusplus extern "C" { @@ -94,5 +94,5 @@ void ERR_load_BUF_strings(void ); #ifdef __cplusplus } #endif -#endif +#endif /* OPENSSL_BUFFER_H */ diff --git a/lib/dns/sec/openssl/include/openssl/crypto.h b/lib/dns/sec/openssl/include/openssl/crypto.h index 41c937966e..2a69c5ab4b 100644 --- a/lib/dns/sec/openssl/include/openssl/crypto.h +++ b/lib/dns/sec/openssl/include/openssl/crypto.h @@ -56,8 +56,8 @@ * [including the GNU Public Licence.] */ -#ifndef HEADER_CRYPTO_H -#define HEADER_CRYPTO_H +#ifndef OPENSSL_CRYPTO_H +#define OPENSSL_CRYPTO_H 1 #ifdef __cplusplus extern "C" { @@ -369,5 +369,5 @@ void ERR_load_CRYPTO_strings(void); #ifdef __cplusplus } #endif -#endif +#endif /* OPENSSL_CRYPTO_H */ diff --git a/lib/dns/sec/openssl/include/openssl/dh.h b/lib/dns/sec/openssl/include/openssl/dh.h index c15b2ad483..c164c14989 100644 --- a/lib/dns/sec/openssl/include/openssl/dh.h +++ b/lib/dns/sec/openssl/include/openssl/dh.h @@ -56,8 +56,8 @@ * [including the GNU Public Licence.] */ -#ifndef HEADER_DH_H -#define HEADER_DH_H +#ifndef OPENSSL_DH_H +#define OPENSSL_DH_H 1 #ifdef __cplusplus extern "C" { @@ -169,7 +169,7 @@ int i2d_DHparams(DH *a,unsigned char **pp); #ifndef NO_FP_API int DHparams_print_fp(FILE *fp, DH *x); #endif -#ifdef HEADER_BIO_H +#ifdef OPENSSL_BIO_H int DHparams_print(BIO *bp, DH *x); #else int DHparams_print(char *bp, DH *x); @@ -197,5 +197,5 @@ void ERR_load_DH_strings(void ); #ifdef __cplusplus } #endif -#endif +#endif /* OPENSSL_DH_H */ diff --git a/lib/dns/sec/openssl/include/openssl/dsa.h b/lib/dns/sec/openssl/include/openssl/dsa.h index 68d9912cbc..243775f4f8 100644 --- a/lib/dns/sec/openssl/include/openssl/dsa.h +++ b/lib/dns/sec/openssl/include/openssl/dsa.h @@ -62,8 +62,8 @@ * work and I have just tweaked them a little to fit into my * stylistic vision for SSLeay :-) */ -#ifndef HEADER_DSA_H -#define HEADER_DSA_H +#ifndef OPENSSL_DSA_H +#define OPENSSL_DSA_H 1 #ifdef __cplusplus extern "C" { @@ -188,7 +188,7 @@ int i2d_DSAPublicKey(DSA *a, unsigned char **pp); int i2d_DSAPrivateKey(DSA *a, unsigned char **pp); int i2d_DSAparams(DSA *a,unsigned char **pp); -#ifdef HEADER_BIO_H +#ifdef OPENSSL_BIO_H int DSAparams_print(BIO *bp, DSA *x); int DSA_print(BIO *bp, DSA *x, int off); #endif @@ -237,5 +237,5 @@ DH *DSA_dup_DH(DSA *r); #ifdef __cplusplus } #endif -#endif +#endif /* OPENSSL_DSA_H */ diff --git a/lib/dns/sec/openssl/include/openssl/e_os.h b/lib/dns/sec/openssl/include/openssl/e_os.h index b8d053bda5..1a3e49d149 100644 --- a/lib/dns/sec/openssl/include/openssl/e_os.h +++ b/lib/dns/sec/openssl/include/openssl/e_os.h @@ -56,8 +56,8 @@ * [including the GNU Public Licence.] */ -#ifndef HEADER_E_OS_H -#define HEADER_E_OS_H +#ifndef OPENSSL_E_OS_H +#define OPENSSL_E_OS_H 1 #include /* contains what we can justify to make visible @@ -369,5 +369,5 @@ extern HINSTANCE _hInstance; } #endif -#endif +#endif /* OPENSSL_E_OS_H */ diff --git a/lib/dns/sec/openssl/include/openssl/e_os2.h b/lib/dns/sec/openssl/include/openssl/e_os2.h index 2bc0b48798..63e5d54764 100644 --- a/lib/dns/sec/openssl/include/openssl/e_os2.h +++ b/lib/dns/sec/openssl/include/openssl/e_os2.h @@ -1,7 +1,7 @@ /* e_os2.h */ -#ifndef HEADER_E_OS2_H -#define HEADER_E_OS2_H +#ifndef OPENSSL_E_OS2_H +#define OPENSSL_E_OS2_H 1 #ifdef __cplusplus extern "C" { @@ -24,5 +24,5 @@ extern "C" { #ifdef __cplusplus } #endif -#endif +#endif /* OPENSSL_E_OS2_H */ diff --git a/lib/dns/sec/openssl/include/openssl/err.h b/lib/dns/sec/openssl/include/openssl/err.h index 15bafbff43..10ec4d9011 100644 --- a/lib/dns/sec/openssl/include/openssl/err.h +++ b/lib/dns/sec/openssl/include/openssl/err.h @@ -56,8 +56,8 @@ * [including the GNU Public Licence.] */ -#ifndef HEADER_ERR_H -#define HEADER_ERR_H +#ifndef OPENSSL_ERR_H +#define OPENSSL_ERR_H 1 #ifdef __cplusplus extern "C" { @@ -69,7 +69,7 @@ extern "C" { /* The following is a bit of a trick to help the object files only contain * the 'name of the file' string once. Since 'err.h' is protected by the - * HEADER_ERR_H stuff, this should be included only once per file. */ + * OPENSSL_ERR_H stuff, this should be included only once per file. */ #define ERR_file_name __FILE__ @@ -236,7 +236,7 @@ const char *ERR_reason_error_string(unsigned long e); #ifndef NO_FP_API void ERR_print_errors_fp(FILE *fp); #endif -#ifdef HEADER_BIO_H +#ifdef OPENSSL_BIO_H void ERR_print_errors(BIO *bp); void ERR_add_error_data(int num, ...); #endif @@ -248,7 +248,7 @@ void ERR_free_strings(void); void ERR_remove_state(unsigned long pid); /* if zero we look it up */ ERR_STATE *ERR_get_state(void); -#ifdef HEADER_LHASH_H +#ifdef OPENSSL_LHASH_H LHASH *ERR_get_string_table(void ); LHASH *ERR_get_err_state_table(void ); #else @@ -262,4 +262,5 @@ int ERR_get_next_error_library(void ); } #endif -#endif +#endif /* OPENSSL_ERR_H */ + diff --git a/lib/dns/sec/openssl/include/openssl/lhash.h b/lib/dns/sec/openssl/include/openssl/lhash.h index 6f6eeb2698..e9d760893b 100644 --- a/lib/dns/sec/openssl/include/openssl/lhash.h +++ b/lib/dns/sec/openssl/include/openssl/lhash.h @@ -60,8 +60,8 @@ * Author - Eric Young */ -#ifndef HEADER_LHASH_H -#define HEADER_LHASH_H +#ifndef OPENSSL_LHASH_H +#define OPENSSL_LHASH_H 1 #ifdef __cplusplus extern "C" { @@ -131,7 +131,7 @@ void lh_node_stats(LHASH *lh, FILE *out); void lh_node_usage_stats(LHASH *lh, FILE *out); #endif -#ifdef HEADER_BIO_H +#ifdef OPENSSL_BIO_H void lh_stats_bio(LHASH *lh, BIO *out); void lh_node_stats_bio(LHASH *lh, BIO *out); void lh_node_usage_stats_bio(LHASH *lh, BIO *out); @@ -140,5 +140,5 @@ void lh_node_usage_stats_bio(LHASH *lh, BIO *out); } #endif -#endif +#endif /* OPENSSL_LHASH_H */ diff --git a/lib/dns/sec/openssl/include/openssl/md5.h b/lib/dns/sec/openssl/include/openssl/md5.h index d10bc8397f..7acff49120 100644 --- a/lib/dns/sec/openssl/include/openssl/md5.h +++ b/lib/dns/sec/openssl/include/openssl/md5.h @@ -56,8 +56,8 @@ * [including the GNU Public Licence.] */ -#ifndef HEADER_MD5_H -#define HEADER_MD5_H +#ifndef OPENSSL_MD5_H +#define OPENSSL_MD5_H 1 #ifdef __cplusplus extern "C" { @@ -111,4 +111,5 @@ void MD5_Transform(MD5_CTX *c, const unsigned char *b); } #endif -#endif +#endif /* OPENSSL_MD5_H */ + diff --git a/lib/dns/sec/openssl/include/openssl/opensslconf.h b/lib/dns/sec/openssl/include/openssl/opensslconf.h index 1ff8fea151..52fb2db73c 100644 --- a/lib/dns/sec/openssl/include/openssl/opensslconf.h +++ b/lib/dns/sec/openssl/include/openssl/opensslconf.h @@ -1,7 +1,7 @@ -#ifndef HEADER_OPENSSLCONF_H -#define HEADER_OPENSSLCONF_H +#ifndef OPENSSL_OPENSSLCONF_H +#define OPENSSL_OPENSSLCONF_H 1 /* This would be filled in by the openssl configure script if it was run. */ -#endif /* HEADER_OPENSSLCONF_H */ +#endif /* OPENSSL_OPENSSLCONF_H */ diff --git a/lib/dns/sec/openssl/include/openssl/opensslv.h b/lib/dns/sec/openssl/include/openssl/opensslv.h index b34462e9fa..c721ceb3f2 100644 --- a/lib/dns/sec/openssl/include/openssl/opensslv.h +++ b/lib/dns/sec/openssl/include/openssl/opensslv.h @@ -1,5 +1,5 @@ -#ifndef HEADER_OPENSSLV_H -#define HEADER_OPENSSLV_H +#ifndef OPENSSL_OPENSSLV_H +#define OPENSSL_OPENSSLV_H 1 /* Numeric release version identifier: * MMNNFFRBB: major minor fix final beta/patch @@ -17,4 +17,5 @@ #define OPENSSL_VERSION_TEXT "OpenSSL 0.9.3a 29 May 1999" #define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT -#endif /* HEADER_OPENSSLV_H */ +#endif /* OPENSSL_OPENSSLV_H */ + diff --git a/lib/dns/sec/openssl/include/openssl/rand.h b/lib/dns/sec/openssl/include/openssl/rand.h index 28f45ec052..0f6a0888d7 100644 --- a/lib/dns/sec/openssl/include/openssl/rand.h +++ b/lib/dns/sec/openssl/include/openssl/rand.h @@ -56,8 +56,8 @@ * [including the GNU Public Licence.] */ -#ifndef HEADER_RAND_H -#define HEADER_RAND_H +#ifndef OPENSSL_RAND_H +#define OPENSSL_RAND_H 1 #ifdef __cplusplus extern "C" { @@ -106,5 +106,5 @@ void ERR_load_RAND_strings(void); #ifdef __cplusplus } #endif -#endif +#endif /* OPENSSL_RAND_H */ diff --git a/lib/dns/sec/openssl/include/openssl/safestack.h b/lib/dns/sec/openssl/include/openssl/safestack.h index 38934981e3..1b018ba717 100644 --- a/lib/dns/sec/openssl/include/openssl/safestack.h +++ b/lib/dns/sec/openssl/include/openssl/safestack.h @@ -52,8 +52,8 @@ * */ -#ifndef HEADER_SAFESTACK_H -#define HEADER_SAFESTACK_H +#ifndef OPENSSL_SAFESTACK_H +#define OPENSSL_SAFESTACK_H 1 #include @@ -126,4 +126,5 @@ type *sk_##type##_pop(STACK_OF(type) *sk) \ void sk_##type##_sort(STACK_OF(type) *sk) \ { sk_sort((STACK *)sk); } -#endif /* ndef HEADER_SAFESTACK_H */ +#endif /* OPENSSL_SAFESTACK_H */ + diff --git a/lib/dns/sec/openssl/include/openssl/sha.h b/lib/dns/sec/openssl/include/openssl/sha.h index 77f6d9695e..9113e53e37 100644 --- a/lib/dns/sec/openssl/include/openssl/sha.h +++ b/lib/dns/sec/openssl/include/openssl/sha.h @@ -56,8 +56,8 @@ * [including the GNU Public Licence.] */ -#ifndef HEADER_SHA_H -#define HEADER_SHA_H +#ifndef OPENSSL_SHA_H +#define OPENSSL_SHA_H 1 #ifdef __cplusplus extern "C" { @@ -116,4 +116,5 @@ void SHA1_Transform(SHA_CTX *c, const unsigned char *data); } #endif -#endif +#endif /* OPENSSL_SHA_H */ + diff --git a/lib/dns/sec/openssl/include/openssl/stack.h b/lib/dns/sec/openssl/include/openssl/stack.h index a615d9b4c9..8d57833339 100644 --- a/lib/dns/sec/openssl/include/openssl/stack.h +++ b/lib/dns/sec/openssl/include/openssl/stack.h @@ -56,8 +56,8 @@ * [including the GNU Public Licence.] */ -#ifndef HEADER_STACK_H -#define HEADER_STACK_H +#ifndef OPENSSL_STACK_H +#define OPENSSL_STACK_H 1 #ifdef __cplusplus extern "C" { @@ -104,4 +104,5 @@ void sk_sort(STACK *st); } #endif -#endif +#endif /* OPENSSL_STACK_H */ + diff --git a/lib/dns/sec/openssl/md32_common.h b/lib/dns/sec/openssl/md32_common.h index 1a404a458d..d1a556a7e1 100644 --- a/lib/dns/sec/openssl/md32_common.h +++ b/lib/dns/sec/openssl/md32_common.h @@ -52,6 +52,8 @@ * Hudson (tjh@cryptsoft.com). * */ +#ifndef OPENSSL_MD32_COMMON_H +#define OPENSSL_MD32_COMMON_H 1 /* * This is a generic 32 bit "collector" for message digest algorithms. @@ -605,3 +607,5 @@ void HASH_FINAL (unsigned char *md, HASH_CTX *c) memset((void *)c,0,sizeof(HASH_CTX)); */ } + +#endif /* OPENSSL_MD32_COMMON_H */ diff --git a/lib/dns/sec/openssl/md5_locl.h b/lib/dns/sec/openssl/md5_locl.h index 71ca6afddb..b89f53f9f3 100644 --- a/lib/dns/sec/openssl/md5_locl.h +++ b/lib/dns/sec/openssl/md5_locl.h @@ -56,6 +56,9 @@ * [including the GNU Public Licence.] */ +#ifndef OPENSSL_MD5_LOCL_H +#define OPENSSL_MD5_LOCL_H 1 + #include #include #include @@ -177,3 +180,5 @@ void dst__openssl_md5_block_data_order (MD5_CTX *c, const void *p,int num); a+=((k)+(t)+I((b),(c),(d))); \ a=ROTATE(a,s); \ a+=b; }; + +#endif /* OPENSSL_MD5_LOCL_H */ diff --git a/lib/dns/sec/openssl/sha_locl.h b/lib/dns/sec/openssl/sha_locl.h index 3e6f489b87..82d316f794 100644 --- a/lib/dns/sec/openssl/sha_locl.h +++ b/lib/dns/sec/openssl/sha_locl.h @@ -55,6 +55,8 @@ * copied and put under another distribution licence * [including the GNU Public Licence.] */ +#ifndef OPENSSL_SHA_LOCL_H +#define OPENSSL_SHA_LOCL_H 1 #include #include @@ -473,3 +475,5 @@ void HASH_BLOCK_DATA_ORDER (SHA_CTX *c, const void *p, int num) } } #endif + +#endif /* OPENSSL_SHA_LOCL_H */ diff --git a/lib/dns/sec/rename-dnssafe.h b/lib/dns/sec/rename-dnssafe.h index d90101840b..26aca779ab 100644 --- a/lib/dns/sec/rename-dnssafe.h +++ b/lib/dns/sec/rename-dnssafe.h @@ -14,6 +14,8 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ +#ifndef SEC_RENAME_DNSSAFE_H +#define SEC_RENAME_DNSSAFE_H 1 #define T_free dst__dnssafe_T_free #define T_malloc dst__dnssafe_T_malloc @@ -247,3 +249,5 @@ #define KIT_PKCS_RSAPrivate dst__dnssafe_KIT_PKCS_RSAPrivate #define KIT_RSA_CRT dst__dnssafe_KIT_RSA_CRT #define KIT_RSAPublic dst__dnssafe_KIT_RSAPublic + +#endif /* SEC_RENAME_DNSSAFE_H */ diff --git a/lib/dns/sec/rename.h b/lib/dns/sec/rename.h index 6927272d8c..0d1cc40930 100644 --- a/lib/dns/sec/rename.h +++ b/lib/dns/sec/rename.h @@ -14,6 +14,8 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ +#ifndef SEC_RENAME_H +#define SEC_RENAME_H 1 #ifdef DST_USE_PRIVATE_OPENSSL #define BN_CTX_end dst__openssl_BN_CTX_end @@ -291,3 +293,5 @@ #define SHA1_version dst__openssl_SHA1_version #define STACK_version dst__openssl_STACK_version #endif + +#endif /* SEC_RENAME_H */ -- GitLab