diff options
Diffstat (limited to 'usr.sbin/bind')
60 files changed, 236 insertions, 468 deletions
diff --git a/usr.sbin/bind/bin/dig/dig.c b/usr.sbin/bind/bin/dig/dig.c index 6395b5176b5..e4dfac8eb89 100644 --- a/usr.sbin/bind/bin/dig/dig.c +++ b/usr.sbin/bind/bin/dig/dig.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dig.c,v 1.32 2020/01/09 13:52:22 florian Exp $ */ +/* $Id: dig.c,v 1.33 2020/01/09 14:18:29 florian Exp $ */ /*! \file */ @@ -76,9 +76,7 @@ static char *argv0; static int addresscount = 0; static char domainopt[DNS_NAME_MAXTEXT]; -#ifdef ISC_PLATFORM_USESIT static char sitvalue[256]; -#endif static isc_boolean_t short_form = ISC_FALSE, printcmd = ISC_TRUE, ip6_int = ISC_FALSE, plusquest = ISC_FALSE, pluscomm = ISC_FALSE, @@ -721,9 +719,7 @@ plus_option(const char *option, isc_boolean_t is_batchfile, char *cmd, *value, *ptr, *code; isc_uint32_t num; isc_boolean_t state = ISC_TRUE; -#if defined(DIG_SIGCHASE) || defined(ISC_PLATFORM_USESIT) size_t n; -#endif strlcpy(option_store, option, sizeof(option_store)); ptr = option_store; @@ -841,23 +837,19 @@ plus_option(const char *option, isc_boolean_t is_batchfile, printcmd = state; break; case 'o': /* comments */ -#ifdef ISC_PLATFORM_USESIT switch (cmd[2]) { case 'o': FULLCHECK("cookie"); goto sit; case 'm': -#endif FULLCHECK("comments"); lookup->comments = state; if (lookup == default_lookup) pluscomm = state; -#ifdef ISC_PLATFORM_USESIT break; default: goto invalid_option; } -#endif break; case 'r': FULLCHECK("crypto"); @@ -1185,7 +1177,6 @@ plus_option(const char *option, isc_boolean_t is_batchfile, goto invalid_option; } break; -#if defined(DIG_SIGCHASE) || defined(ISC_PLATFORM_USESIT) case 'i': switch (cmd[2]) { #ifdef DIG_SIGCHASE @@ -1196,7 +1187,6 @@ plus_option(const char *option, isc_boolean_t is_batchfile, lookup->dnssec = ISC_TRUE; break; #endif -#ifdef ISC_PLATFORM_USESIT case 't': /* sit */ FULLCHECK("sit"); sit: @@ -1212,12 +1202,10 @@ plus_option(const char *option, isc_boolean_t is_batchfile, } else lookup->sitvalue = NULL; break; -#endif default: goto invalid_option; } break; -#endif case 'p': /* split */ FULLCHECK("split"); if (value != NULL && !state) diff --git a/usr.sbin/bind/bin/dig/dighost.c b/usr.sbin/bind/bin/dig/dighost.c index 35c68cc702b..50143d1f8f9 100644 --- a/usr.sbin/bind/bin/dig/dighost.c +++ b/usr.sbin/bind/bin/dig/dighost.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dighost.c,v 1.25 2020/01/09 13:52:22 florian Exp $ */ +/* $Id: dighost.c,v 1.26 2020/01/09 14:18:29 florian Exp $ */ /*! \file * \note @@ -145,9 +145,7 @@ int ndots = -1; int tries = 3; int lookup_counter = 0; -#ifdef ISC_PLATFORM_USESIT static char sitvalue[256]; -#endif #ifdef WITH_IDN static void initialize_idn(void); @@ -860,9 +858,7 @@ make_empty_lookup(void) { #else looknew->idnout = ISC_FALSE; #endif -#ifdef ISC_PLATFORM_USESIT looknew->sit = ISC_FALSE; -#endif #ifdef DIG_SIGCHASE looknew->sigchase = ISC_FALSE; #if DIG_SIGCHASE_TD @@ -900,9 +896,7 @@ make_empty_lookup(void) { looknew->done_as_is = ISC_FALSE; looknew->need_search = ISC_FALSE; looknew->ecs_addr = NULL; -#ifdef ISC_PLATFORM_USESIT looknew->sitvalue = NULL; -#endif looknew->ednsopts = NULL; looknew->ednsoptscnt = 0; looknew->ednsneg = ISC_FALSE; @@ -992,10 +986,8 @@ clone_lookup(dig_lookup_t *lookold, isc_boolean_t servers) { looknew->opcode = lookold->opcode; looknew->expire = lookold->expire; looknew->nsid = lookold->nsid; -#ifdef ISC_PLATFORM_USESIT looknew->sit = lookold->sit; looknew->sitvalue = lookold->sitvalue; -#endif if (lookold->ednsopts != NULL) { cloneopts(looknew, lookold); } else { @@ -2319,14 +2311,12 @@ insert_soa(dig_lookup_t *lookup) { dns_message_addname(lookup->sendmsg, soaname, DNS_SECTION_AUTHORITY); } -#ifdef ISC_PLATFORM_USESIT static void compute_cookie(unsigned char *clientcookie, size_t len) { /* XXXMPA need to fix, should be per server. */ INSIST(len >= 8U); memmove(clientcookie, cookie_secret, 8); } -#endif /*% * Setup the supplied lookup structure, making it ready to start sending @@ -2345,9 +2335,7 @@ setup_lookup(dig_lookup_t *lookup) { dns_compress_t cctx; char store[MXNAME]; char ecsbuf[20]; -#ifdef ISC_PLATFORM_USESIT char sitbuf[256]; -#endif #ifdef WITH_IDN idn_result_t mr; char utf8_textname[MXNAME], utf8_origin[MXNAME], idn_textname[MXNAME]; @@ -2718,7 +2706,6 @@ setup_lookup(dig_lookup_t *lookup) { i++; } -#ifdef ISC_PLATFORM_USESIT if (lookup->sit) { INSIST(i < MAXOPTS); opts[i].code = DNS_OPT_COOKIE; @@ -2736,7 +2723,6 @@ setup_lookup(dig_lookup_t *lookup) { } i++; } -#endif if (lookup->expire) { INSIST(i < MAXOPTS); @@ -3613,7 +3599,6 @@ check_for_more_data(dig_query_t *query, dns_message_t *msg, return (ISC_TRUE); } -#ifdef ISC_PLATFORM_USESIT static void process_sit(dig_lookup_t *l, dns_message_t *msg, isc_buffer_t *optbuf, size_t optlen) @@ -3705,7 +3690,6 @@ process_opt(dig_lookup_t *l, dns_message_t *msg) { } } } -#endif static int ednsvers(dns_rdataset_t *opt) { @@ -4003,10 +3987,8 @@ recv_done(isc_task_t *task, isc_event_t *event) { } if ((msg->flags & DNS_MESSAGEFLAG_TC) != 0 && !l->ignore && !l->tcp_mode) { -#ifdef ISC_PLATFORM_USESIT if (l->sitvalue == NULL && l->sit && msg->opt != NULL) process_opt(l, msg); -#endif if (l->comments) printf(";; Truncated, retrying in TCP mode.\n"); n = requeue_lookup(l, ISC_TRUE); @@ -4109,7 +4091,6 @@ recv_done(isc_task_t *task, isc_event_t *event) { } } -#ifdef ISC_PLATFORM_USESIT if (l->sitvalue != NULL) { if (msg->opt == NULL) printf(";; expected opt record in response\n"); @@ -4117,7 +4098,6 @@ recv_done(isc_task_t *task, isc_event_t *event) { process_opt(l, msg); } else if (l->sit && msg->opt != NULL) process_opt(l, msg); -#endif if (!l->doing_xfr || l->xfr_q == query) { if (msg->rcode == dns_rcode_nxdomain && diff --git a/usr.sbin/bind/bin/dig/include/dig/dig.h b/usr.sbin/bind/bin/dig/include/dig/dig.h index c4a7ba477fe..0e93a989b40 100644 --- a/usr.sbin/bind/bin/dig/include/dig/dig.h +++ b/usr.sbin/bind/bin/dig/include/dig/dig.h @@ -129,9 +129,7 @@ struct dig_lookup { besteffort, dnssec, expire, -#ifdef ISC_PLATFORM_USESIT sit, -#endif nsid, /*% Name Server ID (RFC 5001) */ ednsneg, mapped, @@ -189,9 +187,7 @@ isc_boolean_t sigchase; isc_uint32_t msgcounter; dns_fixedname_t fdomain; isc_sockaddr_t *ecs_addr; -#ifdef ISC_PLATFORM_USESIT char *sitvalue; -#endif dns_ednsopt_t *ednsopts; unsigned int ednsoptscnt; unsigned int ednsflags; diff --git a/usr.sbin/bind/configure b/usr.sbin/bind/configure index d5308be3685..17c996ae18c 100644 --- a/usr.sbin/bind/configure +++ b/usr.sbin/bind/configure @@ -715,7 +715,7 @@ ISC_PLATFORM_HAVEIFNAMETOINDEX ISC_PLATFORM_HAVESTRINGSH ISC_PLATFORM_BRACEPTHREADONCEINIT ISC_PLATFORM_USEDECLSPEC -ISC_PLATFORM_RLIMITTYPE +rlim_t ISC_PLATFORM_HAVESTATNSEC ISC_PLATFORM_HAVESYSUNH ISC_PLATFORM_QUADFORMAT @@ -17900,7 +17900,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext $as_echo_n "checking st_mtim.tv_nsec... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <sys/fcntl.h> +#include <sys/stat.h> int main () { @@ -17943,7 +17943,7 @@ _ACEOF if ac_fn_c_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE rlim_t" + rlim_t="#define ISC_PLATFORM_RLIMITTYPE rlim_t" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -17960,7 +17960,7 @@ else rlimtype="long long int" fi -ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE $rlimtype" +rlim_t="#define ISC_PLATFORM_RLIMITTYPE $rlimtype" { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot determine type of rlim_cur when cross compiling - assuming $rlimtype" >&5 $as_echo "cannot determine type of rlim_cur when cross compiling - assuming $rlimtype" >&6; } else @@ -17975,7 +17975,7 @@ _ACEOF if ac_fn_c_try_run "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: int" >&5 $as_echo "int" >&6; } -ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE int" +rlim_t="#define ISC_PLATFORM_RLIMITTYPE int" else if test "$cross_compiling" = yes; then : @@ -17992,7 +17992,7 @@ _ACEOF if ac_fn_c_try_run "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: long int" >&5 $as_echo "long int" >&6; } -ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE long int" +rlim_t="#define ISC_PLATFORM_RLIMITTYPE long int" else if test "$cross_compiling" = yes; then : @@ -18009,7 +18009,7 @@ _ACEOF if ac_fn_c_try_run "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: long long int" >&5 $as_echo "long long int" >&6; } -ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE long long int" +rlim_t="#define ISC_PLATFORM_RLIMITTYPE long long int" else as_fn_error $? "unable to determine sizeof rlim_cur" "$LINENO" 5 diff --git a/usr.sbin/bind/configure.in b/usr.sbin/bind/configure.in index 270f385fda3..bd2f8d78895 100644 --- a/usr.sbin/bind/configure.in +++ b/usr.sbin/bind/configure.in @@ -3291,7 +3291,7 @@ AC_DEFINE(NEED_OPTARG, 1, [Defined if extern char *optarg is not declared.])]) # Check for nanoseconds in file stats # AC_MSG_CHECKING(st_mtim.tv_nsec) -AC_TRY_COMPILE([#include <sys/fcntl.h>],[struct stat s; return(s.st_mtim.tv_nsec);], +AC_TRY_COMPILE([#include <sys/stat.h>],[struct stat s; return(s.st_mtim.tv_nsec);], [AC_MSG_RESULT(yes) ISC_PLATFORM_HAVESTATNSEC="#define ISC_PLATFORM_HAVESTATNSEC 1"], [AC_MSG_RESULT(no) @@ -3308,7 +3308,7 @@ AC_TRY_COMPILE([ #include <sys/resource.h>], [rlim_t rl = 19671212; return (0);], [AC_MSG_RESULT(yes) - ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE rlim_t"], + rlim_t="#define ISC_PLATFORM_RLIMITTYPE rlim_t"], [AC_MSG_RESULT(no) AC_MSG_CHECKING(type of rlim_cur) @@ -3318,7 +3318,7 @@ AC_TRY_RUN([ #include <sys/resource.h> main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(int)));}], [AC_MSG_RESULT(int) -ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE int"], +rlim_t="#define ISC_PLATFORM_RLIMITTYPE int"], [ AC_TRY_RUN([ #include <sys/types.h> @@ -3326,7 +3326,7 @@ AC_TRY_RUN([ #include <sys/resource.h> main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(long int)));}], [AC_MSG_RESULT(long int) -ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE long int"], +rlim_t="#define ISC_PLATFORM_RLIMITTYPE long int"], [ AC_TRY_RUN([ #include <sys/types.h> @@ -3334,16 +3334,16 @@ AC_TRY_RUN([ #include <sys/resource.h> main() { struct rlimit r; exit((!sizeof(r.rlim_cur) == sizeof(long long int)));}], [AC_MSG_RESULT(long long int) -ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE long long int"], +rlim_t="#define ISC_PLATFORM_RLIMITTYPE long long int"], [AC_MSG_ERROR([unable to determine sizeof rlim_cur]) ],[AC_MSG_ERROR(this cannot happen)]) ],[AC_MSG_ERROR(this cannot happen)]) ],[ AC_ARG_WITH(rlimtype, , rlimtype="$withval", rlimtype="long long int") -ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE $rlimtype" +rlim_t="#define ISC_PLATFORM_RLIMITTYPE $rlimtype" AC_MSG_RESULT(cannot determine type of rlim_cur when cross compiling - assuming $rlimtype)]) ]) -AC_SUBST(ISC_PLATFORM_RLIMITTYPE) +AC_SUBST(rlim_t) # # Older HP-UX doesn't have gettune diff --git a/usr.sbin/bind/lib/dns/adb.c b/usr.sbin/bind/lib/dns/adb.c index 43f5658541f..97db279e7ff 100644 --- a/usr.sbin/bind/lib/dns/adb.c +++ b/usr.sbin/bind/lib/dns/adb.c @@ -3571,7 +3571,6 @@ dump_entry(FILE *f, dns_adb_t *adb, dns_adbentry_t *entry, entry->to512, entry->plain, entry->plainto); if (entry->udpsize != 0U) fprintf(f, " [udpsize %u]", entry->udpsize); -#ifdef ISC_PLATFORM_USESIT if (entry->sit != NULL) { unsigned int i; fprintf(f, " [sit="); @@ -3579,7 +3578,6 @@ dump_entry(FILE *f, dns_adb_t *adb, dns_adbentry_t *entry, fprintf(f, "%02x", entry->sit[i]); fprintf(f, "]"); } -#endif if (entry->expires != 0) fprintf(f, " [ttl %d]", (int)(entry->expires - now)); diff --git a/usr.sbin/bind/lib/dns/dnssec.c b/usr.sbin/bind/lib/dns/dnssec.c index 030a29ccd1b..ef8fa4f4ce7 100644 --- a/usr.sbin/bind/lib/dns/dnssec.c +++ b/usr.sbin/bind/lib/dns/dnssec.c @@ -15,7 +15,7 @@ */ /* - * $Id: dnssec.c,v 1.8 2020/01/09 13:52:23 florian Exp $ + * $Id: dnssec.c,v 1.9 2020/01/09 14:18:29 florian Exp $ */ /*! \file */ @@ -50,7 +50,7 @@ #include <dst/result.h> -LIBDNS_EXTERNAL_DATA isc_stats_t *dns_dnssec_stats; +isc_stats_t *dns_dnssec_stats; #define is_response(msg) (msg->flags & DNS_MESSAGEFLAG_QR) diff --git a/usr.sbin/bind/lib/dns/dst_lib.c b/usr.sbin/bind/lib/dns/dst_lib.c index 8c566b0b51d..46c37f6167e 100644 --- a/usr.sbin/bind/lib/dns/dst_lib.c +++ b/usr.sbin/bind/lib/dns/dst_lib.c @@ -16,7 +16,7 @@ /* * Principal Author: Brian Wellington - * $Id: dst_lib.c,v 1.3 2019/12/17 01:46:31 sthen Exp $ + * $Id: dst_lib.c,v 1.4 2020/01/09 14:18:29 florian Exp $ */ /*! \file */ @@ -35,7 +35,7 @@ *** Globals ***/ -LIBDNS_EXTERNAL_DATA isc_msgcat_t * dst_msgcat = NULL; +isc_msgcat_t * dst_msgcat = NULL; /*** diff --git a/usr.sbin/bind/lib/dns/include/dns/dnssec.h b/usr.sbin/bind/lib/dns/include/dns/dnssec.h index 5bf164e68d6..dedbfabb660 100644 --- a/usr.sbin/bind/lib/dns/include/dns/dnssec.h +++ b/usr.sbin/bind/lib/dns/include/dns/dnssec.h @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dnssec.h,v 1.3 2019/12/17 01:46:32 sthen Exp $ */ +/* $Id: dnssec.h,v 1.4 2020/01/09 14:18:29 florian Exp $ */ #ifndef DNS_DNSSEC_H #define DNS_DNSSEC_H 1 @@ -32,7 +32,7 @@ ISC_LANG_BEGINDECLS -LIBDNS_EXTERNAL_DATA extern isc_stats_t *dns_dnssec_stats; +extern isc_stats_t *dns_dnssec_stats; /*%< Maximum number of keys supported in a zone. */ #define DNS_MAXZONEKEYS 32 diff --git a/usr.sbin/bind/lib/dns/include/dns/lib.h b/usr.sbin/bind/lib/dns/include/dns/lib.h index f4d99b1f63c..7d523b40dcf 100644 --- a/usr.sbin/bind/lib/dns/include/dns/lib.h +++ b/usr.sbin/bind/lib/dns/include/dns/lib.h @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: lib.h,v 1.3 2019/12/17 01:46:32 sthen Exp $ */ +/* $Id: lib.h,v 1.4 2020/01/09 14:18:29 florian Exp $ */ #ifndef DNS_LIB_H #define DNS_LIB_H 1 @@ -29,8 +29,8 @@ ISC_LANG_BEGINDECLS /*% * Tuning: external query load in packets per seconds. */ -LIBDNS_EXTERNAL_DATA extern unsigned int dns_pps; -LIBDNS_EXTERNAL_DATA extern isc_msgcat_t *dns_msgcat; +extern unsigned int dns_pps; +extern isc_msgcat_t *dns_msgcat; void dns_lib_initmsgcat(void); diff --git a/usr.sbin/bind/lib/dns/include/dns/log.h b/usr.sbin/bind/lib/dns/include/dns/log.h index 007c8167732..c1e3f7f9aef 100644 --- a/usr.sbin/bind/lib/dns/include/dns/log.h +++ b/usr.sbin/bind/lib/dns/include/dns/log.h @@ -23,9 +23,9 @@ #include <isc/lang.h> #include <isc/log.h> -LIBDNS_EXTERNAL_DATA extern isc_log_t *dns_lctx; -LIBDNS_EXTERNAL_DATA extern isc_logcategory_t dns_categories[]; -LIBDNS_EXTERNAL_DATA extern isc_logmodule_t dns_modules[]; +extern isc_log_t *dns_lctx; +extern isc_logcategory_t dns_categories[]; +extern isc_logmodule_t dns_modules[]; #define DNS_LOGCATEGORY_NOTIFY (&dns_categories[0]) #define DNS_LOGCATEGORY_DATABASE (&dns_categories[1]) diff --git a/usr.sbin/bind/lib/dns/include/dns/masterdump.h b/usr.sbin/bind/lib/dns/include/dns/masterdump.h index 7f628142582..54184e63633 100644 --- a/usr.sbin/bind/lib/dns/include/dns/masterdump.h +++ b/usr.sbin/bind/lib/dns/include/dns/masterdump.h @@ -116,27 +116,27 @@ ISC_LANG_BEGINDECLS * tab stop for the TTL. The class is only printed for the first * rrset in the file and shares a tab stop with the RR type. */ -LIBDNS_EXTERNAL_DATA extern const dns_master_style_t dns_master_style_default; +extern const dns_master_style_t dns_master_style_default; /*% * A master file style that dumps zones to a very generic format easily * imported/checked with external tools. */ -LIBDNS_EXTERNAL_DATA extern const dns_master_style_t dns_master_style_full; +extern const dns_master_style_t dns_master_style_full; /*% * A master file style that prints explicit TTL values on each * record line, never using $TTL statements. The TTL has a tab * stop of its own, but the class and type share one. */ -LIBDNS_EXTERNAL_DATA extern const dns_master_style_t +extern const dns_master_style_t dns_master_style_explicitttl; /*% * A master style format designed for cache files. It prints explicit TTL * values on each record line and never uses $ORIGIN or relative names. */ -LIBDNS_EXTERNAL_DATA extern const dns_master_style_t dns_master_style_cache; +extern const dns_master_style_t dns_master_style_cache; /*% * A master style that prints name, ttl, class, type, and value on @@ -144,22 +144,22 @@ LIBDNS_EXTERNAL_DATA extern const dns_master_style_t dns_master_style_cache; * Intended for generating master files which can be easily parsed * by perl scripts and similar applications. */ -LIBDNS_EXTERNAL_DATA extern const dns_master_style_t dns_master_style_simple; +extern const dns_master_style_t dns_master_style_simple; /*% * The style used for debugging, "dig" output, etc. */ -LIBDNS_EXTERNAL_DATA extern const dns_master_style_t dns_master_style_debug; +extern const dns_master_style_t dns_master_style_debug; /*% * Similar to dns_master_style_debug but data is prepended with ";" */ -LIBDNS_EXTERNAL_DATA extern const dns_master_style_t dns_master_style_comment; +extern const dns_master_style_t dns_master_style_comment; /*% * The style used for dumping "key" zones. */ -LIBDNS_EXTERNAL_DATA extern const dns_master_style_t dns_master_style_keyzone; +extern const dns_master_style_t dns_master_style_keyzone; /*** *** Functions diff --git a/usr.sbin/bind/lib/dns/include/dns/name.h b/usr.sbin/bind/lib/dns/include/dns/name.h index 42758b05ed1..2784e479abd 100644 --- a/usr.sbin/bind/lib/dns/include/dns/name.h +++ b/usr.sbin/bind/lib/dns/include/dns/name.h @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: name.h,v 1.8 2019/12/17 01:46:32 sthen Exp $ */ +/* $Id: name.h,v 1.9 2020/01/09 14:18:29 florian Exp $ */ #ifndef DNS_NAME_H #define DNS_NAME_H 1 @@ -148,8 +148,8 @@ struct dns_name { #define DNS_NAME_CHECKMX 0x0010 /*%< Used by rdata. */ #define DNS_NAME_CHECKMXFAIL 0x0020 /*%< Used by rdata. */ -LIBDNS_EXTERNAL_DATA extern dns_name_t *dns_rootname; -LIBDNS_EXTERNAL_DATA extern dns_name_t *dns_wildcardname; +extern dns_name_t *dns_rootname; +extern dns_name_t *dns_wildcardname; /*% * Standard size of a wire format name diff --git a/usr.sbin/bind/lib/dns/include/dns/stats.h b/usr.sbin/bind/lib/dns/include/dns/stats.h index 0a86288e504..f65298cb36f 100644 --- a/usr.sbin/bind/lib/dns/include/dns/stats.h +++ b/usr.sbin/bind/lib/dns/include/dns/stats.h @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: stats.h,v 1.3 2019/12/17 01:46:32 sthen Exp $ */ +/* $Id: stats.h,v 1.4 2020/01/09 14:18:29 florian Exp $ */ #ifndef DNS_STATS_H #define DNS_STATS_H 1 @@ -152,7 +152,7 @@ enum { /*%< * (Obsoleted) */ -LIBDNS_EXTERNAL_DATA extern const char *dns_statscounter_names[]; +extern const char *dns_statscounter_names[]; /*% * Attributes for statistics counters of RRset and Rdatatype types. diff --git a/usr.sbin/bind/lib/dns/include/dns/tsig.h b/usr.sbin/bind/lib/dns/include/dns/tsig.h index 32f512dd059..b7069de13d1 100644 --- a/usr.sbin/bind/lib/dns/include/dns/tsig.h +++ b/usr.sbin/bind/lib/dns/include/dns/tsig.h @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: tsig.h,v 1.5 2020/01/09 13:56:37 florian Exp $ */ +/* $Id: tsig.h,v 1.6 2020/01/09 14:18:29 florian Exp $ */ #ifndef DNS_TSIG_H #define DNS_TSIG_H 1 @@ -37,15 +37,15 @@ /* * Algorithms. */ -LIBDNS_EXTERNAL_DATA extern dns_name_t *dns_tsig_hmacsha1_name; +extern dns_name_t *dns_tsig_hmacsha1_name; #define DNS_TSIG_HMACSHA1_NAME dns_tsig_hmacsha1_name -LIBDNS_EXTERNAL_DATA extern dns_name_t *dns_tsig_hmacsha224_name; +extern dns_name_t *dns_tsig_hmacsha224_name; #define DNS_TSIG_HMACSHA224_NAME dns_tsig_hmacsha224_name -LIBDNS_EXTERNAL_DATA extern dns_name_t *dns_tsig_hmacsha256_name; +extern dns_name_t *dns_tsig_hmacsha256_name; #define DNS_TSIG_HMACSHA256_NAME dns_tsig_hmacsha256_name -LIBDNS_EXTERNAL_DATA extern dns_name_t *dns_tsig_hmacsha384_name; +extern dns_name_t *dns_tsig_hmacsha384_name; #define DNS_TSIG_HMACSHA384_NAME dns_tsig_hmacsha384_name -LIBDNS_EXTERNAL_DATA extern dns_name_t *dns_tsig_hmacsha512_name; +extern dns_name_t *dns_tsig_hmacsha512_name; #define DNS_TSIG_HMACSHA512_NAME dns_tsig_hmacsha512_name /*% diff --git a/usr.sbin/bind/lib/dns/include/dns/version.h b/usr.sbin/bind/lib/dns/include/dns/version.h index bf15011db23..d329bc6fd39 100644 --- a/usr.sbin/bind/lib/dns/include/dns/version.h +++ b/usr.sbin/bind/lib/dns/include/dns/version.h @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: version.h,v 1.3 2019/12/17 01:46:32 sthen Exp $ */ +/* $Id: version.h,v 1.4 2020/01/09 14:18:29 florian Exp $ */ /*! \file dns/version.h */ @@ -23,12 +23,12 @@ #include <isc/platform.h> -LIBDNS_EXTERNAL_DATA extern const char dns_version[]; -LIBDNS_EXTERNAL_DATA extern const char dns_major[]; -LIBDNS_EXTERNAL_DATA extern const char dns_mapapi[]; +extern const char dns_version[]; +extern const char dns_major[]; +extern const char dns_mapapi[]; -LIBDNS_EXTERNAL_DATA extern const unsigned int dns_libinterface; -LIBDNS_EXTERNAL_DATA extern const unsigned int dns_librevision; -LIBDNS_EXTERNAL_DATA extern const unsigned int dns_libage; +extern const unsigned int dns_libinterface; +extern const unsigned int dns_librevision; +extern const unsigned int dns_libage; #endif /* DNS_VERSION_H */ diff --git a/usr.sbin/bind/lib/dns/include/dst/lib.h b/usr.sbin/bind/lib/dns/include/dst/lib.h index 7b59b79f959..96b3609e9c3 100644 --- a/usr.sbin/bind/lib/dns/include/dst/lib.h +++ b/usr.sbin/bind/lib/dns/include/dst/lib.h @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: lib.h,v 1.3 2019/12/17 01:46:33 sthen Exp $ */ +/* $Id: lib.h,v 1.4 2020/01/09 14:18:30 florian Exp $ */ #ifndef DST_LIB_H #define DST_LIB_H 1 @@ -26,7 +26,7 @@ ISC_LANG_BEGINDECLS -LIBDNS_EXTERNAL_DATA extern isc_msgcat_t *dst_msgcat; +extern isc_msgcat_t *dst_msgcat; void dst_lib_initmsgcat(void); diff --git a/usr.sbin/bind/lib/dns/lib.c b/usr.sbin/bind/lib/dns/lib.c index 4caf933911b..63c65f48b66 100644 --- a/usr.sbin/bind/lib/dns/lib.c +++ b/usr.sbin/bind/lib/dns/lib.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: lib.c,v 1.3 2019/12/17 01:46:32 sthen Exp $ */ +/* $Id: lib.c,v 1.4 2020/01/09 14:18:29 florian Exp $ */ /*! \file */ @@ -41,8 +41,8 @@ *** Globals ***/ -LIBDNS_EXTERNAL_DATA unsigned int dns_pps = 0U; -LIBDNS_EXTERNAL_DATA isc_msgcat_t * dns_msgcat = NULL; +unsigned int dns_pps = 0U; +isc_msgcat_t * dns_msgcat = NULL; /*** diff --git a/usr.sbin/bind/lib/dns/log.c b/usr.sbin/bind/lib/dns/log.c index 5d64991372f..4d8a7e9b73c 100644 --- a/usr.sbin/bind/lib/dns/log.c +++ b/usr.sbin/bind/lib/dns/log.c @@ -28,7 +28,7 @@ * When adding a new category, be sure to add the appropriate * \#define to <dns/log.h>. */ -LIBDNS_EXTERNAL_DATA isc_logcategory_t dns_categories[] = { +isc_logcategory_t dns_categories[] = { { "notify", 0 }, { "database", 0 }, { "security", 0 }, @@ -52,7 +52,7 @@ LIBDNS_EXTERNAL_DATA isc_logcategory_t dns_categories[] = { * When adding a new module, be sure to add the appropriate * \#define to <dns/log.h>. */ -LIBDNS_EXTERNAL_DATA isc_logmodule_t dns_modules[] = { +isc_logmodule_t dns_modules[] = { { "dns/db", 0 }, { "dns/rbtdb", 0 }, { "dns/rbtdb64", 0 }, @@ -87,7 +87,7 @@ LIBDNS_EXTERNAL_DATA isc_logmodule_t dns_modules[] = { { NULL, 0 } }; -LIBDNS_EXTERNAL_DATA isc_log_t *dns_lctx = NULL; +isc_log_t *dns_lctx = NULL; void dns_log_init(isc_log_t *lctx) { diff --git a/usr.sbin/bind/lib/dns/masterdump.c b/usr.sbin/bind/lib/dns/masterdump.c index b24e4b552e2..9e822fd0862 100644 --- a/usr.sbin/bind/lib/dns/masterdump.c +++ b/usr.sbin/bind/lib/dns/masterdump.c @@ -98,7 +98,7 @@ typedef struct dns_totext_ctx { isc_boolean_t current_ttl_valid; } dns_totext_ctx_t; -LIBDNS_EXTERNAL_DATA const dns_master_style_t +const dns_master_style_t dns_master_style_keyzone = { DNS_STYLEFLAG_OMIT_OWNER | DNS_STYLEFLAG_OMIT_CLASS | @@ -113,7 +113,7 @@ dns_master_style_keyzone = { 24, 24, 24, 32, 80, 8, UINT_MAX }; -LIBDNS_EXTERNAL_DATA const dns_master_style_t +const dns_master_style_t dns_master_style_default = { DNS_STYLEFLAG_OMIT_OWNER | DNS_STYLEFLAG_OMIT_CLASS | @@ -127,14 +127,14 @@ dns_master_style_default = { 24, 24, 24, 32, 80, 8, UINT_MAX }; -LIBDNS_EXTERNAL_DATA const dns_master_style_t +const dns_master_style_t dns_master_style_full = { DNS_STYLEFLAG_COMMENT | DNS_STYLEFLAG_RESIGN, 46, 46, 46, 64, 120, 8, UINT_MAX }; -LIBDNS_EXTERNAL_DATA const dns_master_style_t +const dns_master_style_t dns_master_style_explicitttl = { DNS_STYLEFLAG_OMIT_OWNER | DNS_STYLEFLAG_OMIT_CLASS | @@ -146,7 +146,7 @@ dns_master_style_explicitttl = { 24, 32, 32, 40, 80, 8, UINT_MAX }; -LIBDNS_EXTERNAL_DATA const dns_master_style_t +const dns_master_style_t dns_master_style_cache = { DNS_STYLEFLAG_OMIT_OWNER | DNS_STYLEFLAG_OMIT_CLASS | @@ -157,7 +157,7 @@ dns_master_style_cache = { 24, 32, 32, 40, 80, 8, UINT_MAX }; -LIBDNS_EXTERNAL_DATA const dns_master_style_t +const dns_master_style_t dns_master_style_simple = { 0, 24, 32, 32, 40, 80, 8, UINT_MAX @@ -166,7 +166,7 @@ dns_master_style_simple = { /*% * A style suitable for dns_rdataset_totext(). */ -LIBDNS_EXTERNAL_DATA const dns_master_style_t +const dns_master_style_t dns_master_style_debug = { DNS_STYLEFLAG_REL_OWNER, 24, 32, 40, 48, 80, 8, UINT_MAX @@ -175,7 +175,7 @@ dns_master_style_debug = { /*% * Similar, but with each line commented out. */ -LIBDNS_EXTERNAL_DATA const dns_master_style_t +const dns_master_style_t dns_master_style_comment = { DNS_STYLEFLAG_REL_OWNER | DNS_STYLEFLAG_MULTILINE | diff --git a/usr.sbin/bind/lib/dns/name.c b/usr.sbin/bind/lib/dns/name.c index c8513e8fbea..dc283fcf820 100644 --- a/usr.sbin/bind/lib/dns/name.c +++ b/usr.sbin/bind/lib/dns/name.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: name.c,v 1.15 2020/01/09 13:47:13 florian Exp $ */ +/* $Id: name.c,v 1.16 2020/01/09 14:18:29 florian Exp $ */ /*! \file */ @@ -177,7 +177,7 @@ static unsigned char root_offsets[] = { 0 }; static dns_name_t root = DNS_NAME_INITABSOLUTE(root_ndata, root_offsets); /* XXXDCL make const? */ -LIBDNS_EXTERNAL_DATA dns_name_t *dns_rootname = &root; +dns_name_t *dns_rootname = &root; static unsigned char wild_ndata[] = { "\001*" }; static unsigned char wild_offsets[] = { 0 }; @@ -186,7 +186,7 @@ static dns_name_t wild = DNS_NAME_INITNONABSOLUTE(wild_ndata, wild_offsets); /* XXXDCL make const? */ -LIBDNS_EXTERNAL_DATA dns_name_t *dns_wildcardname = &wild; +dns_name_t *dns_wildcardname = &wild; unsigned int dns_fullname_hash(dns_name_t *name, isc_boolean_t case_sensitive); diff --git a/usr.sbin/bind/lib/dns/resolver.c b/usr.sbin/bind/lib/dns/resolver.c index 39c2a4d3ffd..e3e11c2ff1e 100644 --- a/usr.sbin/bind/lib/dns/resolver.c +++ b/usr.sbin/bind/lib/dns/resolver.c @@ -1997,7 +1997,6 @@ add_triededns512(fetchctx_t *fctx, isc_sockaddr_t *address) { ISC_LIST_INITANDAPPEND(fctx->edns512, tried, link); } -#ifdef ISC_PLATFORM_USESIT static void compute_cc(resquery_t *query, unsigned char *cookie, size_t len) { #ifdef AES_SIT @@ -2072,7 +2071,6 @@ compute_cc(resquery_t *query, unsigned char *cookie, size_t len) { isc_hmacsha256_invalidate(&hmacsha256); #endif } -#endif static isc_boolean_t wouldvalidate(fetchctx_t *fctx) { @@ -2289,10 +2287,8 @@ resquery_send(resquery_t *query) { unsigned int version = 0; /* Default version. */ unsigned int flags = query->addrinfo->flags; isc_boolean_t reqnsid = res->view->requestnsid; -#ifdef ISC_PLATFORM_USESIT isc_boolean_t reqsit = res->view->requestsit; unsigned char cookie[64]; -#endif if ((flags & FCTX_ADDRINFO_EDNSOK) != 0 && (query->options & DNS_FETCHOPT_EDNS512) == 0) { @@ -2336,14 +2332,10 @@ resquery_send(resquery_t *query) { /* Request NSID/COOKIE for current view or peer? */ if (peer != NULL) { (void) dns_peer_getrequestnsid(peer, &reqnsid); -#ifdef ISC_PLATFORM_USESIT (void) dns_peer_getrequestsit(peer, &reqsit); -#endif } -#ifdef ISC_PLATFORM_USESIT if (NOSIT(query->addrinfo)) reqsit = ISC_FALSE; -#endif if (reqnsid) { INSIST(ednsopt < DNS_EDNSOPTIONS); ednsopts[ednsopt].code = DNS_OPT_NSID; @@ -2351,7 +2343,6 @@ resquery_send(resquery_t *query) { ednsopts[ednsopt].value = NULL; ednsopt++; } -#ifdef ISC_PLATFORM_USESIT if (reqsit) { INSIST(ednsopt < DNS_EDNSOPTIONS); ednsopts[ednsopt].code = DNS_OPT_COOKIE; @@ -2372,7 +2363,6 @@ resquery_send(resquery_t *query) { } ednsopt++; } -#endif query->ednsversion = version; result = fctx_addopt(fctx->qmessage, version, udpsize, ednsopts, ednsopt); @@ -7554,12 +7544,10 @@ process_opt(resquery_t *query, dns_rdataset_t *opt) { isc_result_t result; isc_uint16_t optcode; isc_uint16_t optlen; -#ifdef ISC_PLATFORM_USESIT unsigned char *optvalue; dns_adbaddrinfo_t *addrinfo; unsigned char cookie[8]; isc_boolean_t seen_cookie = ISC_FALSE; -#endif isc_boolean_t seen_nsid = ISC_FALSE; result = dns_rdataset_first(opt); @@ -7582,7 +7570,6 @@ process_opt(resquery_t *query, dns_rdataset_t *opt) { isc_buffer_forward(&optbuf, optlen); seen_nsid = ISC_TRUE; break; -#ifdef ISC_PLATFORM_USESIT case DNS_OPT_COOKIE: /* * Only process the first cookie option. @@ -7611,7 +7598,6 @@ process_opt(resquery_t *query, dns_rdataset_t *opt) { dns_resstatscounter_sitin); seen_cookie = ISC_TRUE; break; -#endif default: isc_buffer_forward(&optbuf, optlen); break; @@ -7847,7 +7833,6 @@ resquery_response(isc_task_t *task, isc_event_t *event) { process_opt(query, opt); #ifdef notyet -#ifdef ISC_PLATFORM_USESIT if (message->sitbad) { /* * If the COOKIE is bad assume it is a attack and retry. @@ -7858,7 +7843,6 @@ resquery_response(isc_task_t *task, isc_event_t *event) { goto done; } #endif -#endif /* * If the message is signed, check the signature. If not, this @@ -8021,7 +8005,6 @@ resquery_response(isc_task_t *task, isc_event_t *event) { message->rcode != dns_rcode_nxdomain) { isc_buffer_t b; char code[64]; -#ifdef ISC_PLATFORM_USESIT unsigned char cookie[64]; /* @@ -8038,7 +8021,6 @@ resquery_response(isc_task_t *task, isc_event_t *event) { FCTX_ADDRINFO_NOSIT); resend = ISC_TRUE; } else -#endif if (((message->rcode == dns_rcode_formerr || message->rcode == dns_rcode_notimp) || (message->rcode == dns_rcode_servfail && @@ -8085,7 +8067,6 @@ resquery_response(isc_task_t *task, isc_event_t *event) { } else if (message->rcode == dns_rcode_badvers) { unsigned int flags, mask; unsigned int version; -#ifdef ISC_PLATFORM_USESIT isc_boolean_t nosit = ISC_FALSE; /* @@ -8103,7 +8084,6 @@ resquery_response(isc_task_t *task, isc_event_t *event) { FCTX_ADDRINFO_NOSIT, FCTX_ADDRINFO_NOSIT); } -#endif INSIST(opt != NULL); version = (opt->ttl >> 16) & 0xff; @@ -8129,12 +8109,10 @@ resquery_response(isc_task_t *task, isc_event_t *event) { case 0: dns_adb_changeflags(fctx->adb, query->addrinfo, flags, mask); -#ifdef ISC_PLATFORM_USESIT if (nosit) { resend = ISC_TRUE; break; } -#endif /* FALLTHROUGH */ default: broken_server = DNS_R_BADVERS; diff --git a/usr.sbin/bind/lib/dns/ssu_external.c b/usr.sbin/bind/lib/dns/ssu_external.c index 4b6570ff3dc..e294bb6d017 100644 --- a/usr.sbin/bind/lib/dns/ssu_external.c +++ b/usr.sbin/bind/lib/dns/ssu_external.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: ssu_external.c,v 1.3 2020/01/09 13:47:13 florian Exp $ */ +/* $Id: ssu_external.c,v 1.4 2020/01/09 14:18:29 florian Exp $ */ /* * This implements external update-policy rules. This allows permission @@ -26,10 +26,8 @@ #include <errno.h> #include <unistd.h> -#ifdef ISC_PLATFORM_HAVESYSUNH #include <sys/socket.h> #include <sys/un.h> -#endif #include <isc/magic.h> #include <isc/mem.h> @@ -66,7 +64,6 @@ ssu_e_log(int level, const char *fmt, ...) { static int ux_socket_connect(const char *path) { int fd = -1; -#ifdef ISC_PLATFORM_HAVESYSUNH struct sockaddr_un addr; REQUIRE(path != NULL); @@ -100,7 +97,6 @@ ux_socket_connect(const char *path) { close(fd); return (-1); } -#endif return (fd); } diff --git a/usr.sbin/bind/lib/dns/stats.c b/usr.sbin/bind/lib/dns/stats.c index a1e7153201b..7cd2cfe990e 100644 --- a/usr.sbin/bind/lib/dns/stats.c +++ b/usr.sbin/bind/lib/dns/stats.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: stats.c,v 1.3 2019/12/17 01:46:32 sthen Exp $ */ +/* $Id: stats.c,v 1.4 2020/01/09 14:18:29 florian Exp $ */ /*! \file */ @@ -404,7 +404,7 @@ dns_opcodestats_dump(dns_stats_t *stats, dns_opcodestats_dumper_t dump_fn, /*** *** Obsolete variables and functions follow: ***/ -LIBDNS_EXTERNAL_DATA const char *dns_statscounter_names[DNS_STATS_NCOUNTERS] = +const char *dns_statscounter_names[DNS_STATS_NCOUNTERS] = { "success", "referral", diff --git a/usr.sbin/bind/lib/dns/tsig.c b/usr.sbin/bind/lib/dns/tsig.c index 0daff38d530..69efaa6fc36 100644 --- a/usr.sbin/bind/lib/dns/tsig.c +++ b/usr.sbin/bind/lib/dns/tsig.c @@ -15,7 +15,7 @@ */ /* - * $Id: tsig.c,v 1.11 2020/01/09 13:56:37 florian Exp $ + * $Id: tsig.c,v 1.12 2020/01/09 14:18:29 florian Exp $ */ /*! \file */ #include <config.h> @@ -77,31 +77,31 @@ static unsigned char hmacsha1_ndata[] = "\011hmac-sha1"; static unsigned char hmacsha1_offsets[] = { 0, 10 }; static dns_name_t hmacsha1 = DNS_NAME_INITABSOLUTE(hmacsha1_ndata, hmacsha1_offsets); -LIBDNS_EXTERNAL_DATA dns_name_t *dns_tsig_hmacsha1_name = &hmacsha1; +dns_name_t *dns_tsig_hmacsha1_name = &hmacsha1; static unsigned char hmacsha224_ndata[] = "\013hmac-sha224"; static unsigned char hmacsha224_offsets[] = { 0, 12 }; static dns_name_t hmacsha224 = DNS_NAME_INITABSOLUTE(hmacsha224_ndata, hmacsha224_offsets); -LIBDNS_EXTERNAL_DATA dns_name_t *dns_tsig_hmacsha224_name = &hmacsha224; +dns_name_t *dns_tsig_hmacsha224_name = &hmacsha224; static unsigned char hmacsha256_ndata[] = "\013hmac-sha256"; static unsigned char hmacsha256_offsets[] = { 0, 12 }; static dns_name_t hmacsha256 = DNS_NAME_INITABSOLUTE(hmacsha256_ndata, hmacsha256_offsets); -LIBDNS_EXTERNAL_DATA dns_name_t *dns_tsig_hmacsha256_name = &hmacsha256; +dns_name_t *dns_tsig_hmacsha256_name = &hmacsha256; static unsigned char hmacsha384_ndata[] = "\013hmac-sha384"; static unsigned char hmacsha384_offsets[] = { 0, 12 }; static dns_name_t hmacsha384 = DNS_NAME_INITABSOLUTE(hmacsha384_ndata, hmacsha384_offsets); -LIBDNS_EXTERNAL_DATA dns_name_t *dns_tsig_hmacsha384_name = &hmacsha384; +dns_name_t *dns_tsig_hmacsha384_name = &hmacsha384; static unsigned char hmacsha512_ndata[] = "\013hmac-sha512"; static unsigned char hmacsha512_offsets[] = { 0, 12 }; static dns_name_t hmacsha512 = DNS_NAME_INITABSOLUTE(hmacsha512_ndata, hmacsha512_offsets); -LIBDNS_EXTERNAL_DATA dns_name_t *dns_tsig_hmacsha512_name = &hmacsha512; +dns_name_t *dns_tsig_hmacsha512_name = &hmacsha512; static isc_result_t tsig_verify_tcp(isc_buffer_t *source, dns_message_t *msg); diff --git a/usr.sbin/bind/lib/dns/zone.c b/usr.sbin/bind/lib/dns/zone.c index 69d07a4d9c8..1c376d24a31 100644 --- a/usr.sbin/bind/lib/dns/zone.c +++ b/usr.sbin/bind/lib/dns/zone.c @@ -707,9 +707,9 @@ struct dns_include { #define HOUR 3600 #define DAY (24*HOUR) #define MONTH (30*DAY) -LIBDNS_EXTERNAL_DATA unsigned int dns_zone_mkey_hour = HOUR; -LIBDNS_EXTERNAL_DATA unsigned int dns_zone_mkey_day = DAY; -LIBDNS_EXTERNAL_DATA unsigned int dns_zone_mkey_month = MONTH; +unsigned int dns_zone_mkey_hour = HOUR; +unsigned int dns_zone_mkey_day = DAY; +unsigned int dns_zone_mkey_month = MONTH; #define SEND_BUFFER_SIZE 2048 diff --git a/usr.sbin/bind/lib/isc/aes.c b/usr.sbin/bind/lib/isc/aes.c index 44bc6eabb1d..c8a0b8c0bb6 100644 --- a/usr.sbin/bind/lib/isc/aes.c +++ b/usr.sbin/bind/lib/isc/aes.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: aes.c,v 1.3 2020/01/09 13:52:23 florian Exp $ */ +/* $Id: aes.c,v 1.4 2020/01/09 14:18:30 florian Exp $ */ /*! \file isc/aes.c */ @@ -27,7 +27,6 @@ #include <isc/types.h> #include <isc/util.h> -#ifdef ISC_PLATFORM_WANTAES #if HAVE_OPENSSL_EVP_AES #include <openssl/opensslv.h> @@ -133,4 +132,3 @@ isc_aes256_crypt(const unsigned char *key, const unsigned char *in, } #endif -#endif /* ISC_PLATFORM_WANTAES */ diff --git a/usr.sbin/bind/lib/isc/bind9.c b/usr.sbin/bind/lib/isc/bind9.c index c08b3b8571a..e96b6e5ea73 100644 --- a/usr.sbin/bind/lib/isc/bind9.c +++ b/usr.sbin/bind/lib/isc/bind9.c @@ -27,4 +27,4 @@ * clients will run isc_lib_register(), which sets it to ISC_FALSE, * overriding certain BIND9 behaviors. */ -LIBISC_EXTERNAL_DATA isc_boolean_t isc_bind9 = ISC_TRUE; +isc_boolean_t isc_bind9 = ISC_TRUE; diff --git a/usr.sbin/bind/lib/isc/commandline.c b/usr.sbin/bind/lib/isc/commandline.c index 3c20a222f0f..9e6a18d6bec 100644 --- a/usr.sbin/bind/lib/isc/commandline.c +++ b/usr.sbin/bind/lib/isc/commandline.c @@ -43,7 +43,7 @@ * SUCH DAMAGE. */ -/* $Id: commandline.c,v 1.8 2020/01/09 13:47:13 florian Exp $ */ +/* $Id: commandline.c,v 1.9 2020/01/09 14:18:30 florian Exp $ */ /*! \file * This file was adapted from the NetBSD project's source tree, RCS ID: @@ -69,17 +69,17 @@ #include <isc/util.h> /*% Index into parent argv vector. */ -LIBISC_EXTERNAL_DATA int isc_commandline_index = 1; +int isc_commandline_index = 1; /*% Character checked for validity. */ -LIBISC_EXTERNAL_DATA int isc_commandline_option; +int isc_commandline_option; /*% Argument associated with option. */ -LIBISC_EXTERNAL_DATA char *isc_commandline_argument; +char *isc_commandline_argument; /*% For printing error messages. */ -LIBISC_EXTERNAL_DATA char *isc_commandline_progname; +char *isc_commandline_progname; /*% Print error messages. */ -LIBISC_EXTERNAL_DATA isc_boolean_t isc_commandline_errprint = ISC_TRUE; +isc_boolean_t isc_commandline_errprint = ISC_TRUE; /*% Reset processing. */ -LIBISC_EXTERNAL_DATA isc_boolean_t isc_commandline_reset = ISC_TRUE; +isc_boolean_t isc_commandline_reset = ISC_TRUE; static char endopt = '\0'; diff --git a/usr.sbin/bind/lib/isc/include/isc/aes.h b/usr.sbin/bind/lib/isc/include/isc/aes.h index 90948353410..6151c842693 100644 --- a/usr.sbin/bind/lib/isc/include/isc/aes.h +++ b/usr.sbin/bind/lib/isc/include/isc/aes.h @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: aes.h,v 1.2 2019/12/17 01:46:35 sthen Exp $ */ +/* $Id: aes.h,v 1.3 2020/01/09 14:18:30 florian Exp $ */ /*! \file isc/aes.h */ @@ -30,8 +30,6 @@ #define ISC_AES256_KEYLENGTH 32U #define ISC_AES_BLOCK_LENGTH 16U -#ifdef ISC_PLATFORM_WANTAES - ISC_LANG_BEGINDECLS void @@ -48,6 +46,4 @@ isc_aes256_crypt(const unsigned char *key, const unsigned char *in, ISC_LANG_ENDDECLS -#endif /* ISC_PLATFORM_WANTAES */ - #endif /* ISC_AES_H */ diff --git a/usr.sbin/bind/lib/isc/include/isc/bind9.h b/usr.sbin/bind/lib/isc/include/isc/bind9.h index 35e6a6c83ef..00766cf59b8 100644 --- a/usr.sbin/bind/lib/isc/include/isc/bind9.h +++ b/usr.sbin/bind/lib/isc/include/isc/bind9.h @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: bind9.h,v 1.2 2019/12/17 01:46:35 sthen Exp $ */ +/* $Id: bind9.h,v 1.3 2020/01/09 14:18:30 florian Exp $ */ #ifndef ISC_BIND9_H #define ISC_BIND9_H 1 @@ -28,6 +28,6 @@ * tools) it must be set to ISC_TRUE at runtime. Export library clients * will call isc_lib_register(), which will set it to ISC_FALSE. */ -LIBISC_EXTERNAL_DATA extern isc_boolean_t isc_bind9; +extern isc_boolean_t isc_bind9; #endif /* ISC_BIND9_H */ diff --git a/usr.sbin/bind/lib/isc/include/isc/commandline.h b/usr.sbin/bind/lib/isc/include/isc/commandline.h index 6e3b35d068a..b07431beb49 100644 --- a/usr.sbin/bind/lib/isc/include/isc/commandline.h +++ b/usr.sbin/bind/lib/isc/include/isc/commandline.h @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: commandline.h,v 1.3 2019/12/17 01:46:35 sthen Exp $ */ +/* $Id: commandline.h,v 1.4 2020/01/09 14:18:30 florian Exp $ */ #ifndef ISC_COMMANDLINE_H #define ISC_COMMANDLINE_H 1 @@ -26,17 +26,17 @@ #include <isc/platform.h> /*% Index into parent argv vector. */ -LIBISC_EXTERNAL_DATA extern int isc_commandline_index; +extern int isc_commandline_index; /*% Character checked for validity. */ -LIBISC_EXTERNAL_DATA extern int isc_commandline_option; +extern int isc_commandline_option; /*% Argument associated with option. */ -LIBISC_EXTERNAL_DATA extern char *isc_commandline_argument; +extern char *isc_commandline_argument; /*% For printing error messages. */ -LIBISC_EXTERNAL_DATA extern char *isc_commandline_progname; +extern char *isc_commandline_progname; /*% Print error message. */ -LIBISC_EXTERNAL_DATA extern isc_boolean_t isc_commandline_errprint; +extern isc_boolean_t isc_commandline_errprint; /*% Reset getopt. */ -LIBISC_EXTERNAL_DATA extern isc_boolean_t isc_commandline_reset; +extern isc_boolean_t isc_commandline_reset; ISC_LANG_BEGINDECLS diff --git a/usr.sbin/bind/lib/isc/include/isc/ipv6.h b/usr.sbin/bind/lib/isc/include/isc/ipv6.h index 86626e7890a..5e2560ec6b5 100644 --- a/usr.sbin/bind/lib/isc/include/isc/ipv6.h +++ b/usr.sbin/bind/lib/isc/include/isc/ipv6.h @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: ipv6.h,v 1.4 2020/01/09 13:45:33 florian Exp $ */ +/* $Id: ipv6.h,v 1.5 2020/01/09 14:18:30 florian Exp $ */ #ifndef ISC_IPV6_H #define ISC_IPV6_H 1 @@ -74,8 +74,8 @@ struct in6_addr { #define IN6ADDR_ANY_INIT {{{ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }}} #define IN6ADDR_LOOPBACK_INIT {{{ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 }}} -LIBISC_EXTERNAL_DATA extern const struct in6_addr in6addr_any; -LIBISC_EXTERNAL_DATA extern const struct in6_addr in6addr_loopback; +extern const struct in6_addr in6addr_any; +extern const struct in6_addr in6addr_loopback; struct sockaddr_in6 { isc_uint8_t sin6_len; diff --git a/usr.sbin/bind/lib/isc/include/isc/lib.h b/usr.sbin/bind/lib/isc/include/isc/lib.h index 9404324624a..30f4469d856 100644 --- a/usr.sbin/bind/lib/isc/include/isc/lib.h +++ b/usr.sbin/bind/lib/isc/include/isc/lib.h @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: lib.h,v 1.3 2019/12/17 01:46:35 sthen Exp $ */ +/* $Id: lib.h,v 1.4 2020/01/09 14:18:30 florian Exp $ */ #ifndef ISC_LIB_H #define ISC_LIB_H 1 @@ -26,7 +26,7 @@ ISC_LANG_BEGINDECLS -LIBISC_EXTERNAL_DATA extern isc_msgcat_t *isc_msgcat; +extern isc_msgcat_t *isc_msgcat; void isc_lib_initmsgcat(void); diff --git a/usr.sbin/bind/lib/isc/include/isc/log.h b/usr.sbin/bind/lib/isc/include/isc/log.h index f0ba04dc2ad..7b148212da4 100644 --- a/usr.sbin/bind/lib/isc/include/isc/log.h +++ b/usr.sbin/bind/lib/isc/include/isc/log.h @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: log.h,v 1.6 2019/12/17 01:46:35 sthen Exp $ */ +/* $Id: log.h,v 1.7 2020/01/09 14:18:30 florian Exp $ */ #ifndef ISC_LOG_H #define ISC_LOG_H 1 @@ -148,9 +148,9 @@ typedef union isc_logdestination { * definitions with indexes into its isc_logcategory structure corresponding to * the order of the names. */ -LIBISC_EXTERNAL_DATA extern isc_logcategory_t isc_categories[]; -LIBISC_EXTERNAL_DATA extern isc_log_t *isc_lctx; -LIBISC_EXTERNAL_DATA extern isc_logmodule_t isc_modules[]; +extern isc_logcategory_t isc_categories[]; +extern isc_log_t *isc_lctx; +extern isc_logmodule_t isc_modules[]; /*@}*/ /*@{*/ diff --git a/usr.sbin/bind/lib/isc/include/isc/mem.h b/usr.sbin/bind/lib/isc/include/isc/mem.h index bf790265204..9a017059ba3 100644 --- a/usr.sbin/bind/lib/isc/include/isc/mem.h +++ b/usr.sbin/bind/lib/isc/include/isc/mem.h @@ -86,8 +86,8 @@ typedef void (*isc_memfree_t)(void *, void *); #define ISC_MEMPOOL_NAMES 1 #endif -LIBISC_EXTERNAL_DATA extern unsigned int isc_mem_debugging; -LIBISC_EXTERNAL_DATA extern unsigned int isc_mem_defaultflags; +extern unsigned int isc_mem_debugging; +extern unsigned int isc_mem_defaultflags; /*@{*/ #define ISC_MEM_DEBUGTRACE 0x00000001U diff --git a/usr.sbin/bind/lib/isc/include/isc/netaddr.h b/usr.sbin/bind/lib/isc/include/isc/netaddr.h index 94e8b76f01b..993e576a3b8 100644 --- a/usr.sbin/bind/lib/isc/include/isc/netaddr.h +++ b/usr.sbin/bind/lib/isc/include/isc/netaddr.h @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: netaddr.h,v 1.3 2019/12/17 01:46:35 sthen Exp $ */ +/* $Id: netaddr.h,v 1.4 2020/01/09 14:18:30 florian Exp $ */ #ifndef ISC_NETADDR_H #define ISC_NETADDR_H 1 @@ -25,10 +25,8 @@ #include <isc/net.h> #include <isc/types.h> -#ifdef ISC_PLATFORM_HAVESYSUNH #include <sys/types.h> #include <sys/un.h> -#endif ISC_LANG_BEGINDECLS @@ -37,9 +35,7 @@ struct isc_netaddr { union { struct in_addr in; struct in6_addr in6; -#ifdef ISC_PLATFORM_HAVESYSUNH char un[sizeof(((struct sockaddr_un *)0)->sun_path)]; -#endif } type; isc_uint32_t zone; }; diff --git a/usr.sbin/bind/lib/isc/include/isc/platform.h.in b/usr.sbin/bind/lib/isc/include/isc/platform.h.in index be1acbad39a..4430aabeb7f 100644 --- a/usr.sbin/bind/lib/isc/include/isc/platform.h.in +++ b/usr.sbin/bind/lib/isc/include/isc/platform.h.in @@ -28,42 +28,6 @@ ***/ /* - * Defined if unistd.h does not cause fd_set to be delared. - */ -@ISC_PLATFORM_NEEDSYSSELECTH@ - -/* - * Define if the system has nanosecond-level accuracy in file stats. - */ -@ISC_PLATFORM_HAVESTATNSEC@ - -/* - * Type used for resource limits. - */ -@ISC_PLATFORM_RLIMITTYPE@ - -/* - * Define if your compiler supports "long long int". - */ -@ISC_PLATFORM_HAVELONGLONG@ - -/* - * Define if PTHREAD_ONCE_INIT should be surrounded by braces to - * prevent compiler warnings (such as with gcc on Solaris 2.8). - */ -@ISC_PLATFORM_BRACEPTHREADONCEINIT@ - -/* - * Used to control how extern data is linked; needed for Win32 platforms. - */ -@ISC_PLATFORM_USEDECLSPEC@ - -/* - * Define if the platform has <sys/un.h>. - */ -@ISC_PLATFORM_HAVESYSUNH@ - -/* * If the "xadd" operation is available on this architecture, * ISC_PLATFORM_HAVEXADD will be defined. */ @@ -115,75 +79,22 @@ @ISC_PLATFORM_USESTDASM@ /* - * Define if the platform has <strings.h>. - */ -@ISC_PLATFORM_HAVESTRINGSH@ - -/* * Define if the hash functions must be provided by OpenSSL. */ @ISC_PLATFORM_OPENSSLHASH@ /* - * Define if AES support is wanted - */ -@ISC_PLATFORM_WANTAES@ - -/* * Defines for the noreturn attribute. */ @ISC_PLATFORM_NORETURN_PRE@ @ISC_PLATFORM_NORETURN_POST@ /* - * Defined if we are enabling SIT (Source Identity Token). - */ -@ISC_PLATFORM_USESIT@ - -/*** - *** Windows dll support. - ***/ - -/* * Define if MacOS style of PPC assembly must be used. * e.g. "r6", not "6", for register six. */ @ISC_PLATFORM_USEMACASM@ -#ifndef ISC_PLATFORM_USEDECLSPEC -#define LIBISC_EXTERNAL_DATA -#define LIBDNS_EXTERNAL_DATA -#define LIBISCCFG_EXTERNAL_DATA -#define LIBBIND9_EXTERNAL_DATA -#define LIBTESTS_EXTERNAL_DATA -#else /*! \brief ISC_PLATFORM_USEDECLSPEC */ -#ifdef LIBISC_EXPORTS -#define LIBISC_EXTERNAL_DATA __declspec(dllexport) -#else -#define LIBISC_EXTERNAL_DATA __declspec(dllimport) -#endif -#ifdef LIBDNS_EXPORTS -#define LIBDNS_EXTERNAL_DATA __declspec(dllexport) -#else -#define LIBDNS_EXTERNAL_DATA __declspec(dllimport) -#endif -#ifdef LIBISCCFG_EXPORTS -#define LIBISCCFG_EXTERNAL_DATA __declspec(dllexport) -#else -#define LIBISCCFG_EXTERNAL_DATA __declspec(dllimport) -#endif -#ifdef LIBBIND9_EXPORTS -#define LIBBIND9_EXTERNAL_DATA __declspec(dllexport) -#else -#define LIBBIND9_EXTERNAL_DATA __declspec(dllimport) -#endif -#ifdef LIBTESTS_EXPORTS -#define LIBTESTS_EXTERNAL_DATA __declspec(dllexport) -#else -#define LIBTESTS_EXTERNAL_DATA __declspec(dllimport) -#endif -#endif /*! \brief ISC_PLATFORM_USEDECLSPEC */ - /* * Tell emacs to use C mode for this file. * diff --git a/usr.sbin/bind/lib/isc/include/isc/sockaddr.h b/usr.sbin/bind/lib/isc/include/isc/sockaddr.h index 724acaebb9e..cf4a692cf59 100644 --- a/usr.sbin/bind/lib/isc/include/isc/sockaddr.h +++ b/usr.sbin/bind/lib/isc/include/isc/sockaddr.h @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: sockaddr.h,v 1.3 2019/12/17 01:46:35 sthen Exp $ */ +/* $Id: sockaddr.h,v 1.4 2020/01/09 14:18:30 florian Exp $ */ #ifndef ISC_SOCKADDR_H #define ISC_SOCKADDR_H 1 @@ -24,9 +24,7 @@ #include <isc/lang.h> #include <isc/net.h> #include <isc/types.h> -#ifdef ISC_PLATFORM_HAVESYSUNH #include <sys/un.h> -#endif struct isc_sockaddr { union { @@ -34,9 +32,7 @@ struct isc_sockaddr { struct sockaddr_in sin; struct sockaddr_in6 sin6; struct sockaddr_storage ss; -#ifdef ISC_PLATFORM_HAVESYSUNH struct sockaddr_un sunix; -#endif } type; unsigned int length; /* XXXRTH beginning? */ ISC_LINK(struct isc_sockaddr) link; diff --git a/usr.sbin/bind/lib/isc/include/isc/string.h b/usr.sbin/bind/lib/isc/include/isc/string.h index 28f4a2f6f76..75b16c211f5 100644 --- a/usr.sbin/bind/lib/isc/include/isc/string.h +++ b/usr.sbin/bind/lib/isc/include/isc/string.h @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: string.h,v 1.7 2020/01/09 13:47:14 florian Exp $ */ +/* $Id: string.h,v 1.8 2020/01/09 14:18:30 florian Exp $ */ #ifndef ISC_STRING_H #define ISC_STRING_H 1 @@ -29,9 +29,7 @@ #include <string.h> -#ifdef ISC_PLATFORM_HAVESTRINGSH #include <strings.h> -#endif #define ISC_STRING_MAGIC 0x5e diff --git a/usr.sbin/bind/lib/isc/include/isc/version.h b/usr.sbin/bind/lib/isc/include/isc/version.h index 2e7132d0857..c6e1c2e9452 100644 --- a/usr.sbin/bind/lib/isc/include/isc/version.h +++ b/usr.sbin/bind/lib/isc/include/isc/version.h @@ -14,14 +14,14 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: version.h,v 1.3 2019/12/17 01:46:35 sthen Exp $ */ +/* $Id: version.h,v 1.4 2020/01/09 14:18:30 florian Exp $ */ /*! \file isc/version.h */ #include <isc/platform.h> -LIBISC_EXTERNAL_DATA extern const char isc_version[]; +extern const char isc_version[]; -LIBISC_EXTERNAL_DATA extern const unsigned int isc_libinterface; -LIBISC_EXTERNAL_DATA extern const unsigned int isc_librevision; -LIBISC_EXTERNAL_DATA extern const unsigned int isc_libage; +extern const unsigned int isc_libinterface; +extern const unsigned int isc_librevision; +extern const unsigned int isc_libage; diff --git a/usr.sbin/bind/lib/isc/lib.c b/usr.sbin/bind/lib/isc/lib.c index 8a511fcc409..78d68dabc1b 100644 --- a/usr.sbin/bind/lib/isc/lib.c +++ b/usr.sbin/bind/lib/isc/lib.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: lib.c,v 1.4 2020/01/09 13:47:13 florian Exp $ */ +/* $Id: lib.c,v 1.5 2020/01/09 14:18:30 florian Exp $ */ /*! \file */ @@ -38,7 +38,7 @@ *** Globals ***/ -LIBISC_EXTERNAL_DATA isc_msgcat_t * isc_msgcat = NULL; +isc_msgcat_t * isc_msgcat = NULL; /*** diff --git a/usr.sbin/bind/lib/isc/log.c b/usr.sbin/bind/lib/isc/log.c index e02e3575950..33d41f72072 100644 --- a/usr.sbin/bind/lib/isc/log.c +++ b/usr.sbin/bind/lib/isc/log.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: log.c,v 1.13 2020/01/09 13:47:13 florian Exp $ */ +/* $Id: log.c,v 1.14 2020/01/09 14:18:30 florian Exp $ */ /*! \file * \author Principal Authors: DCL */ @@ -189,7 +189,7 @@ static const int syslog_map[] = { * be overridden. Since the default is always looked up as the first * channellist in the log context, it must come first in isc_categories[]. */ -LIBISC_EXTERNAL_DATA isc_logcategory_t isc_categories[] = { +isc_logcategory_t isc_categories[] = { { "default", 0 }, /* "default" must come first. */ { "general", 0 }, { NULL, 0 } @@ -198,7 +198,7 @@ LIBISC_EXTERNAL_DATA isc_logcategory_t isc_categories[] = { /*! * See above comment for categories on LIBISC_EXTERNAL_DATA, and apply it to modules. */ -LIBISC_EXTERNAL_DATA isc_logmodule_t isc_modules[] = { +isc_logmodule_t isc_modules[] = { { "socket", 0 }, { "time", 0 }, { "interface", 0 }, @@ -218,7 +218,7 @@ static isc_logchannellist_t default_channel; /*! * libisc logs to this context. */ -LIBISC_EXTERNAL_DATA isc_log_t *isc_lctx = NULL; +isc_log_t *isc_lctx = NULL; /*! * Forward declarations. diff --git a/usr.sbin/bind/lib/isc/mem.c b/usr.sbin/bind/lib/isc/mem.c index 221a80d11aa..9726cf6a8f3 100644 --- a/usr.sbin/bind/lib/isc/mem.c +++ b/usr.sbin/bind/lib/isc/mem.c @@ -43,8 +43,8 @@ #ifndef ISC_MEM_DEBUGGING #define ISC_MEM_DEBUGGING 0 #endif -LIBISC_EXTERNAL_DATA unsigned int isc_mem_debugging = ISC_MEM_DEBUGGING; -LIBISC_EXTERNAL_DATA unsigned int isc_mem_defaultflags = ISC_MEMFLAG_DEFAULT; +unsigned int isc_mem_debugging = ISC_MEM_DEBUGGING; +unsigned int isc_mem_defaultflags = ISC_MEMFLAG_DEFAULT; /* * Constants. diff --git a/usr.sbin/bind/lib/isc/netaddr.c b/usr.sbin/bind/lib/isc/netaddr.c index db741a07ce1..c8b28900aa5 100644 --- a/usr.sbin/bind/lib/isc/netaddr.c +++ b/usr.sbin/bind/lib/isc/netaddr.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: netaddr.c,v 1.6 2020/01/09 13:47:13 florian Exp $ */ +/* $Id: netaddr.c,v 1.7 2020/01/09 14:18:30 florian Exp $ */ /*! \file */ @@ -52,12 +52,10 @@ isc_netaddr_equal(const isc_netaddr_t *a, const isc_netaddr_t *b) { a->zone != b->zone) return (ISC_FALSE); break; -#ifdef ISC_PLATFORM_HAVESYSUNH case AF_UNIX: if (strcmp(a->type.un, b->type.un) != 0) return (ISC_FALSE); break; -#endif default: return (ISC_FALSE); } @@ -140,7 +138,6 @@ isc_netaddr_totext(const isc_netaddr_t *netaddr, isc_buffer_t *target) { case AF_INET6: type = &netaddr->type.in6; break; -#ifdef ISC_PLATFORM_HAVESYSUNH case AF_UNIX: alen = strlen(netaddr->type.un); if (alen > isc_buffer_availablelength(target)) @@ -149,7 +146,6 @@ isc_netaddr_totext(const isc_netaddr_t *netaddr, isc_buffer_t *target) { (const unsigned char *)(netaddr->type.un), alen); return (ISC_R_SUCCESS); -#endif default: return (ISC_R_FAILURE); } @@ -299,7 +295,6 @@ isc_netaddr_fromin6(isc_netaddr_t *netaddr, const struct in6_addr *ina6) { isc_result_t isc_netaddr_frompath(isc_netaddr_t *netaddr, const char *path) { -#ifdef ISC_PLATFORM_HAVESYSUNH if (strlen(path) > sizeof(netaddr->type.un) - 1) return (ISC_R_NOSPACE); @@ -308,11 +303,6 @@ isc_netaddr_frompath(isc_netaddr_t *netaddr, const char *path) { strlcpy(netaddr->type.un, path, sizeof(netaddr->type.un)); netaddr->zone = 0; return (ISC_R_SUCCESS); -#else - UNUSED(netaddr); - UNUSED(path); - return (ISC_R_NOTIMPLEMENTED); -#endif } @@ -342,12 +332,10 @@ isc_netaddr_fromsockaddr(isc_netaddr_t *t, const isc_sockaddr_t *s) { memmove(&t->type.in6, &s->type.sin6.sin6_addr, 16); t->zone = s->type.sin6.sin6_scope_id; break; -#ifdef ISC_PLATFORM_HAVESYSUNH case AF_UNIX: memmove(t->type.un, s->type.sunix.sun_path, sizeof(t->type.un)); t->zone = 0; break; -#endif default: INSIST(0); } diff --git a/usr.sbin/bind/lib/isc/sockaddr.c b/usr.sbin/bind/lib/isc/sockaddr.c index 8a37b419e9b..1a7a15f0f32 100644 --- a/usr.sbin/bind/lib/isc/sockaddr.c +++ b/usr.sbin/bind/lib/isc/sockaddr.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: sockaddr.c,v 1.11 2020/01/09 13:47:14 florian Exp $ */ +/* $Id: sockaddr.c,v 1.12 2020/01/09 14:18:30 florian Exp $ */ /*! \file */ @@ -473,7 +473,6 @@ isc_sockaddr_isnetzero(const isc_sockaddr_t *sockaddr) { isc_result_t isc_sockaddr_frompath(isc_sockaddr_t *sockaddr, const char *path) { -#ifdef ISC_PLATFORM_HAVESYSUNH if (strlen(path) >= sizeof(sockaddr->type.sunix.sun_path)) return (ISC_R_NOSPACE); memset(sockaddr, 0, sizeof(*sockaddr)); @@ -484,9 +483,4 @@ isc_sockaddr_frompath(isc_sockaddr_t *sockaddr, const char *path) { strlcpy(sockaddr->type.sunix.sun_path, path, sizeof(sockaddr->type.sunix.sun_path)); return (ISC_R_SUCCESS); -#else - UNUSED(sockaddr); - UNUSED(path); - return (ISC_R_NOTIMPLEMENTED); -#endif } diff --git a/usr.sbin/bind/lib/isc/unix/entropy.c b/usr.sbin/bind/lib/isc/unix/entropy.c index 3f5c9800921..09f2e8ece72 100644 --- a/usr.sbin/bind/lib/isc/unix/entropy.c +++ b/usr.sbin/bind/lib/isc/unix/entropy.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: entropy.c,v 1.10 2020/01/09 13:47:14 florian Exp $ */ +/* $Id: entropy.c,v 1.11 2020/01/09 14:18:30 florian Exp $ */ /* \file unix/entropy.c * \brief @@ -40,9 +40,7 @@ #include <isc/strerror.h> #include <isc/string.h> -#ifdef ISC_PLATFORM_NEEDSYSSELECTH #include <sys/select.h> -#endif #include "errno2result.h" diff --git a/usr.sbin/bind/lib/isc/unix/file.c b/usr.sbin/bind/lib/isc/unix/file.c index d43e4f7aaae..ad1e4b72a08 100644 --- a/usr.sbin/bind/lib/isc/unix/file.c +++ b/usr.sbin/bind/lib/isc/unix/file.c @@ -43,7 +43,7 @@ * SUCH DAMAGE. */ -/* $Id: file.c,v 1.7 2019/12/17 01:46:37 sthen Exp $ */ +/* $Id: file.c,v 1.8 2020/01/09 14:18:30 florian Exp $ */ /*! \file */ @@ -148,11 +148,7 @@ isc_file_getmodtime(const char *file, isc_time_t *modtime) { result = file_stats(file, &stats); if (result == ISC_R_SUCCESS) -#ifdef ISC_PLATFORM_HAVESTATNSEC isc_time_set(modtime, stats.st_mtime, stats.st_mtim.tv_nsec); -#else - isc_time_set(modtime, stats.st_mtime, 0); -#endif return (result); } diff --git a/usr.sbin/bind/lib/isc/unix/resource.c b/usr.sbin/bind/lib/isc/unix/resource.c index fd2fb9524a9..57605894dcf 100644 --- a/usr.sbin/bind/lib/isc/unix/resource.c +++ b/usr.sbin/bind/lib/isc/unix/resource.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: resource.c,v 1.4 2019/12/17 01:46:37 sthen Exp $ */ +/* $Id: resource.c,v 1.5 2020/01/09 14:18:30 florian Exp $ */ #include <config.h> @@ -103,7 +103,7 @@ resource2rlim(isc_resource_t resource, int *rlim_resource) { isc_result_t isc_resource_setlimit(isc_resource_t resource, isc_resourcevalue_t value) { struct rlimit rl; - ISC_PLATFORM_RLIMITTYPE rlim_value; + rlim_t rlim_value; int unixresult; int unixresource; isc_result_t result; @@ -121,17 +121,17 @@ isc_resource_setlimit(isc_resource_t resource, isc_resourcevalue_t value) { * integer so that it could contain the maximum range of * reasonable values. Unfortunately, this exceeds the typical * range on Unix systems. Ensure the range of - * ISC_PLATFORM_RLIMITTYPE is not overflowed. + * rlim_t is not overflowed. */ isc_resourcevalue_t rlim_max; isc_boolean_t rlim_t_is_signed = - ISC_TF(((double)(ISC_PLATFORM_RLIMITTYPE)-1) < 0); + ISC_TF(((double)(rlim_t)-1) < 0); if (rlim_t_is_signed) - rlim_max = ~((ISC_PLATFORM_RLIMITTYPE)1 << - (sizeof(ISC_PLATFORM_RLIMITTYPE) * 8 - 1)); + rlim_max = ~((rlim_t)1 << + (sizeof(rlim_t) * 8 - 1)); else - rlim_max = (ISC_PLATFORM_RLIMITTYPE)-1; + rlim_max = (rlim_t)-1; if (value > rlim_max) value = rlim_max; diff --git a/usr.sbin/bind/lib/isc/unix/socket.c b/usr.sbin/bind/lib/isc/unix/socket.c index e86c2a09cd1..6dc3c30881f 100644 --- a/usr.sbin/bind/lib/isc/unix/socket.c +++ b/usr.sbin/bind/lib/isc/unix/socket.c @@ -65,9 +65,7 @@ #include <isc/util.h> #include <isc/xml.h> -#ifdef ISC_PLATFORM_HAVESYSUNH #include <sys/un.h> -#endif #include <sys/event.h> #include <netinet/tcp.h> @@ -1579,11 +1577,9 @@ build_msghdr_recv(isc__socket_t *sock, char *cmsgbuf, isc_socketevent_t *dev, } else if (sock->pf == AF_INET6) { msg->msg_name = (void *)&dev->address.type.sin6; msg->msg_namelen = sizeof(dev->address.type.sin6); -#ifdef ISC_PLATFORM_HAVESYSUNH } else if (sock->pf == AF_UNIX) { msg->msg_name = (void *)&dev->address.type.sunix; msg->msg_namelen = sizeof(dev->address.type.sunix); -#endif } else { msg->msg_name = (void *)&dev->address.type.sa; msg->msg_namelen = sizeof(dev->address.type); @@ -5122,7 +5118,6 @@ isc__socket_sendto2(isc_socket_t *sock0, isc_region_t *region, void isc__socket_cleanunix(isc_sockaddr_t *sockaddr, isc_boolean_t active) { -#ifdef ISC_PLATFORM_HAVESYSUNH int s; struct stat sb; char strbuf[ISC_STRERRORSIZE]; @@ -5244,17 +5239,12 @@ isc__socket_cleanunix(isc_sockaddr_t *sockaddr, isc_boolean_t active) { } cleanup: close(s); -#else - UNUSED(sockaddr); - UNUSED(active); -#endif } isc_result_t isc__socket_permunix(isc_sockaddr_t *sockaddr, isc_uint32_t perm, isc_uint32_t owner, isc_uint32_t group) { -#ifdef ISC_PLATFORM_HAVESYSUNH isc_result_t result = ISC_R_SUCCESS; char strbuf[ISC_STRERRORSIZE]; char path[sizeof(sockaddr->type.sunix.sun_path)]; @@ -5297,13 +5287,6 @@ isc__socket_permunix(isc_sockaddr_t *sockaddr, isc_uint32_t perm, result = ISC_R_FAILURE; } return (result); -#else - UNUSED(sockaddr); - UNUSED(perm); - UNUSED(owner); - UNUSED(group); - return (ISC_R_NOTIMPLEMENTED); -#endif } isc_result_t diff --git a/usr.sbin/bind/lib/isc/unix/socket_p.h b/usr.sbin/bind/lib/isc/unix/socket_p.h index 306d1d5ed4a..a5e3ff975b4 100644 --- a/usr.sbin/bind/lib/isc/unix/socket_p.h +++ b/usr.sbin/bind/lib/isc/unix/socket_p.h @@ -14,16 +14,14 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: socket_p.h,v 1.5 2019/12/17 01:46:37 sthen Exp $ */ +/* $Id: socket_p.h,v 1.6 2020/01/09 14:18:30 florian Exp $ */ #ifndef ISC_SOCKET_P_H #define ISC_SOCKET_P_H /*! \file */ -#ifdef ISC_PLATFORM_NEEDSYSSELECTH #include <sys/select.h> -#endif typedef struct isc_socketwait isc_socketwait_t; int isc__socketmgr_waitevents(isc_socketmgr_t *, struct timeval *, diff --git a/usr.sbin/bind/lib/isccfg/dnsconf.c b/usr.sbin/bind/lib/isccfg/dnsconf.c index 7e32fe17caa..c2670c99ea2 100644 --- a/usr.sbin/bind/lib/isccfg/dnsconf.c +++ b/usr.sbin/bind/lib/isccfg/dnsconf.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dnsconf.c,v 1.2 2019/12/17 01:46:38 sthen Exp $ */ +/* $Id: dnsconf.c,v 1.3 2020/01/09 14:18:30 florian Exp $ */ /*! \file */ @@ -63,7 +63,7 @@ dnsconf_clausesets[] = { NULL }; -LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_dnsconf = { +cfg_type_t cfg_type_dnsconf = { "dnsconf", cfg_parse_mapbody, cfg_print_mapbody, cfg_doc_mapbody, &cfg_rep_map, dnsconf_clausesets }; diff --git a/usr.sbin/bind/lib/isccfg/include/isccfg/dnsconf.h b/usr.sbin/bind/lib/isccfg/include/isccfg/dnsconf.h index 10fe91d460f..9852b001185 100644 --- a/usr.sbin/bind/lib/isccfg/include/isccfg/dnsconf.h +++ b/usr.sbin/bind/lib/isccfg/include/isccfg/dnsconf.h @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dnsconf.h,v 1.2 2019/12/17 01:46:38 sthen Exp $ */ +/* $Id: dnsconf.h,v 1.3 2020/01/09 14:18:30 florian Exp $ */ #ifndef ISCCFG_DNSCONF_H #define ISCCFG_DNSCONF_H 1 @@ -29,7 +29,7 @@ /* * Configuration object types. */ -LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_dnsconf; +extern cfg_type_t cfg_type_dnsconf; /*%< A complete dns.conf file. */ #endif /* ISCCFG_DNSCONF_H */ diff --git a/usr.sbin/bind/lib/isccfg/include/isccfg/grammar.h b/usr.sbin/bind/lib/isccfg/include/isccfg/grammar.h index c8356534569..fb4e4abdd74 100644 --- a/usr.sbin/bind/lib/isccfg/include/isccfg/grammar.h +++ b/usr.sbin/bind/lib/isccfg/include/isccfg/grammar.h @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: grammar.h,v 1.3 2019/12/17 01:46:38 sthen Exp $ */ +/* $Id: grammar.h,v 1.4 2020/01/09 14:18:30 florian Exp $ */ #ifndef ISCCFG_GRAMMAR_H #define ISCCFG_GRAMMAR_H 1 @@ -254,42 +254,42 @@ struct cfg_parser { /*% * Predefined data representation types. */ -LIBISCCFG_EXTERNAL_DATA extern cfg_rep_t cfg_rep_uint32; -LIBISCCFG_EXTERNAL_DATA extern cfg_rep_t cfg_rep_uint64; -LIBISCCFG_EXTERNAL_DATA extern cfg_rep_t cfg_rep_string; -LIBISCCFG_EXTERNAL_DATA extern cfg_rep_t cfg_rep_boolean; -LIBISCCFG_EXTERNAL_DATA extern cfg_rep_t cfg_rep_map; -LIBISCCFG_EXTERNAL_DATA extern cfg_rep_t cfg_rep_list; -LIBISCCFG_EXTERNAL_DATA extern cfg_rep_t cfg_rep_tuple; -LIBISCCFG_EXTERNAL_DATA extern cfg_rep_t cfg_rep_sockaddr; -LIBISCCFG_EXTERNAL_DATA extern cfg_rep_t cfg_rep_netprefix; -LIBISCCFG_EXTERNAL_DATA extern cfg_rep_t cfg_rep_void; -LIBISCCFG_EXTERNAL_DATA extern cfg_rep_t cfg_rep_fixedpoint; +extern cfg_rep_t cfg_rep_uint32; +extern cfg_rep_t cfg_rep_uint64; +extern cfg_rep_t cfg_rep_string; +extern cfg_rep_t cfg_rep_boolean; +extern cfg_rep_t cfg_rep_map; +extern cfg_rep_t cfg_rep_list; +extern cfg_rep_t cfg_rep_tuple; +extern cfg_rep_t cfg_rep_sockaddr; +extern cfg_rep_t cfg_rep_netprefix; +extern cfg_rep_t cfg_rep_void; +extern cfg_rep_t cfg_rep_fixedpoint; /*@}*/ /*@{*/ /*% * Predefined configuration object types. */ -LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_boolean; -LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_uint32; -LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_uint64; -LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_qstring; -LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_astring; -LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_ustring; -LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_sstring; -LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_sockaddr; -LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_sockaddrdscp; -LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_netaddr; -LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_netaddr4; -LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_netaddr4wild; -LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_netaddr6; -LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_netaddr6wild; -LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_netprefix; -LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_void; -LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_token; -LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_unsupported; -LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_fixedpoint; +extern cfg_type_t cfg_type_boolean; +extern cfg_type_t cfg_type_uint32; +extern cfg_type_t cfg_type_uint64; +extern cfg_type_t cfg_type_qstring; +extern cfg_type_t cfg_type_astring; +extern cfg_type_t cfg_type_ustring; +extern cfg_type_t cfg_type_sstring; +extern cfg_type_t cfg_type_sockaddr; +extern cfg_type_t cfg_type_sockaddrdscp; +extern cfg_type_t cfg_type_netaddr; +extern cfg_type_t cfg_type_netaddr4; +extern cfg_type_t cfg_type_netaddr4wild; +extern cfg_type_t cfg_type_netaddr6; +extern cfg_type_t cfg_type_netaddr6wild; +extern cfg_type_t cfg_type_netprefix; +extern cfg_type_t cfg_type_void; +extern cfg_type_t cfg_type_token; +extern cfg_type_t cfg_type_unsupported; +extern cfg_type_t cfg_type_fixedpoint; /*@}*/ isc_result_t diff --git a/usr.sbin/bind/lib/isccfg/include/isccfg/log.h b/usr.sbin/bind/lib/isccfg/include/isccfg/log.h index 133951533b0..b3c47d34e9b 100644 --- a/usr.sbin/bind/lib/isccfg/include/isccfg/log.h +++ b/usr.sbin/bind/lib/isccfg/include/isccfg/log.h @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: log.h,v 1.3 2019/12/17 01:46:38 sthen Exp $ */ +/* $Id: log.h,v 1.4 2020/01/09 14:18:30 florian Exp $ */ #ifndef ISCCFG_LOG_H #define ISCCFG_LOG_H 1 @@ -24,8 +24,8 @@ #include <isc/lang.h> #include <isc/log.h> -LIBISCCFG_EXTERNAL_DATA extern isc_logcategory_t cfg_categories[]; -LIBISCCFG_EXTERNAL_DATA extern isc_logmodule_t cfg_modules[]; +extern isc_logcategory_t cfg_categories[]; +extern isc_logmodule_t cfg_modules[]; #define CFG_LOGCATEGORY_CONFIG (&cfg_categories[0]) diff --git a/usr.sbin/bind/lib/isccfg/include/isccfg/namedconf.h b/usr.sbin/bind/lib/isccfg/include/isccfg/namedconf.h index 6681875e8e5..4d20a55682f 100644 --- a/usr.sbin/bind/lib/isccfg/include/isccfg/namedconf.h +++ b/usr.sbin/bind/lib/isccfg/include/isccfg/namedconf.h @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: namedconf.h,v 1.3 2019/12/17 01:46:38 sthen Exp $ */ +/* $Id: namedconf.h,v 1.4 2020/01/09 14:18:30 florian Exp $ */ #ifndef ISCCFG_NAMEDCONF_H #define ISCCFG_NAMEDCONF_H 1 @@ -29,28 +29,28 @@ /* * Configuration object types. */ -LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_namedconf; +extern cfg_type_t cfg_type_namedconf; /*%< A complete named.conf file. */ -LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_bindkeys; +extern cfg_type_t cfg_type_bindkeys; /*%< A bind.keys file. */ -LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_newzones; +extern cfg_type_t cfg_type_newzones; /*%< A new-zones file (for zones added by 'rndc addzone'). */ -LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_addzoneconf; +extern cfg_type_t cfg_type_addzoneconf; /*%< A single zone passed via the addzone rndc command. */ -LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_rndcconf; +extern cfg_type_t cfg_type_rndcconf; /*%< A complete rndc.conf file. */ -LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_rndckey; +extern cfg_type_t cfg_type_rndckey; /*%< A complete rndc.key file. */ -LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_sessionkey; +extern cfg_type_t cfg_type_sessionkey; /*%< A complete session.key file. */ -LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_keyref; +extern cfg_type_t cfg_type_keyref; /*%< A key reference, used as an ACL element */ #endif /* ISCCFG_NAMEDCONF_H */ diff --git a/usr.sbin/bind/lib/isccfg/include/isccfg/version.h b/usr.sbin/bind/lib/isccfg/include/isccfg/version.h index 10ff89ed082..a1a13f667b9 100644 --- a/usr.sbin/bind/lib/isccfg/include/isccfg/version.h +++ b/usr.sbin/bind/lib/isccfg/include/isccfg/version.h @@ -14,14 +14,14 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: version.h,v 1.3 2019/12/17 01:46:38 sthen Exp $ */ +/* $Id: version.h,v 1.4 2020/01/09 14:18:30 florian Exp $ */ /*! \file isccfg/version.h */ #include <isc/platform.h> -LIBISCCFG_EXTERNAL_DATA extern const char cfg_version[]; +extern const char cfg_version[]; -LIBISCCFG_EXTERNAL_DATA extern const unsigned int cfg_libinterface; -LIBISCCFG_EXTERNAL_DATA extern const unsigned int cfg_librevision; -LIBISCCFG_EXTERNAL_DATA extern const unsigned int cfg_libage; +extern const unsigned int cfg_libinterface; +extern const unsigned int cfg_librevision; +extern const unsigned int cfg_libage; diff --git a/usr.sbin/bind/lib/isccfg/log.c b/usr.sbin/bind/lib/isccfg/log.c index b402f39bf69..a9a270a33ad 100644 --- a/usr.sbin/bind/lib/isccfg/log.c +++ b/usr.sbin/bind/lib/isccfg/log.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: log.c,v 1.3 2019/12/17 01:46:38 sthen Exp $ */ +/* $Id: log.c,v 1.4 2020/01/09 14:18:30 florian Exp $ */ /*! \file */ @@ -28,7 +28,7 @@ * When adding a new category, be sure to add the appropriate * \#define to <isccfg/log.h>. */ -LIBISCCFG_EXTERNAL_DATA isc_logcategory_t cfg_categories[] = { +isc_logcategory_t cfg_categories[] = { { "config", 0 }, { NULL, 0 } }; @@ -37,7 +37,7 @@ LIBISCCFG_EXTERNAL_DATA isc_logcategory_t cfg_categories[] = { * When adding a new module, be sure to add the appropriate * \#define to <isccfg/log.h>. */ -LIBISCCFG_EXTERNAL_DATA isc_logmodule_t cfg_modules[] = { +isc_logmodule_t cfg_modules[] = { { "isccfg/parser", 0 }, { NULL, 0 } }; diff --git a/usr.sbin/bind/lib/isccfg/namedconf.c b/usr.sbin/bind/lib/isccfg/namedconf.c index 57f449f4cd4..a056a3ff4c3 100644 --- a/usr.sbin/bind/lib/isccfg/namedconf.c +++ b/usr.sbin/bind/lib/isccfg/namedconf.c @@ -1035,12 +1035,7 @@ options_clauses[] = { { "session-keyalg", &cfg_type_astring, 0 }, { "session-keyfile", &cfg_type_qstringornone, 0 }, { "session-keyname", &cfg_type_astring, 0 }, -#ifdef ISC_PLATFORM_USESIT { "sit-secret", &cfg_type_sstring, CFG_CLAUSEFLAG_EXPERIMENTAL }, -#else - { "sit-secret", &cfg_type_sstring, - CFG_CLAUSEFLAG_EXPERIMENTAL | CFG_CLAUSEFLAG_NOTCONFIGURED }, -#endif { "stacksize", &cfg_type_size, 0 }, { "statistics-file", &cfg_type_qstring, 0 }, { "statistics-interval", &cfg_type_uint32, CFG_CLAUSEFLAG_NYI }, @@ -1591,12 +1586,7 @@ view_clauses[] = { { "min-roots", &cfg_type_uint32, CFG_CLAUSEFLAG_NOTIMP }, { "minimal-responses", &cfg_type_boolean, 0 }, { "no-case-compress", &cfg_type_bracketed_aml, 0 }, -#ifdef ISC_PLATFORM_USESIT { "nosit-udp-size", &cfg_type_uint32, CFG_CLAUSEFLAG_EXPERIMENTAL }, -#else - { "nosit-udp-size", &cfg_type_uint32, - CFG_CLAUSEFLAG_EXPERIMENTAL | CFG_CLAUSEFLAG_NOTCONFIGURED }, -#endif { "preferred-glue", &cfg_type_astring, 0 }, { "prefetch", &cfg_type_prefetch, 0 }, { "provide-ixfr", &cfg_type_boolean, 0 }, @@ -1612,12 +1602,7 @@ view_clauses[] = { { "rate-limit", &cfg_type_rrl, 0 }, { "recursion", &cfg_type_boolean, 0 }, { "request-nsid", &cfg_type_boolean, 0 }, -#ifdef ISC_PLATFORM_USESIT { "request-sit", &cfg_type_boolean, CFG_CLAUSEFLAG_EXPERIMENTAL }, -#else - { "request-sit", &cfg_type_boolean, - CFG_CLAUSEFLAG_EXPERIMENTAL | CFG_CLAUSEFLAG_NOTCONFIGURED }, -#endif { "resolver-query-timeout", &cfg_type_uint32, 0 }, { "response-policy", &cfg_type_rpz, 0 }, { "rfc2308-type1", &cfg_type_boolean, CFG_CLAUSEFLAG_NYI }, @@ -1770,7 +1755,7 @@ namedconf_clausesets[] = { namedconf_or_view_clauses, NULL }; -LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_namedconf = { +cfg_type_t cfg_type_namedconf = { "namedconf", cfg_parse_mapbody, cfg_print_mapbody, cfg_doc_mapbody, &cfg_rep_map, namedconf_clausesets }; @@ -1781,7 +1766,7 @@ bindkeys_clausesets[] = { bindkeys_clauses, NULL }; -LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_bindkeys = { +cfg_type_t cfg_type_bindkeys = { "bindkeys", cfg_parse_mapbody, cfg_print_mapbody, cfg_doc_mapbody, &cfg_rep_map, bindkeys_clausesets }; @@ -1881,12 +1866,7 @@ server_clauses[] = { { "query-source-v6", &cfg_type_querysource6, 0 }, { "request-ixfr", &cfg_type_boolean, 0 }, { "request-nsid", &cfg_type_boolean, 0 }, -#ifdef ISC_PLATFORM_USESIT { "request-sit", &cfg_type_boolean, CFG_CLAUSEFLAG_EXPERIMENTAL }, -#else - { "request-sit", &cfg_type_boolean, - CFG_CLAUSEFLAG_EXPERIMENTAL | CFG_CLAUSEFLAG_NOTCONFIGURED }, -#endif { "support-ixfr", &cfg_type_boolean, CFG_CLAUSEFLAG_OBSOLETE }, { "tcp-only", &cfg_type_boolean, 0 }, { "transfer-format", &cfg_type_transferformat, 0 }, @@ -1988,7 +1968,7 @@ addzoneconf_clausesets[] = { NULL }; -LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_addzoneconf = { +cfg_type_t cfg_type_addzoneconf = { "addzoneconf", cfg_parse_mapbody, cfg_print_mapbody, cfg_doc_mapbody, &cfg_rep_map, addzoneconf_clausesets }; @@ -2006,7 +1986,7 @@ newzones_clausesets[] = { NULL }; -LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_newzones = { +cfg_type_t cfg_type_newzones = { "newzones", cfg_parse_mapbody, cfg_print_mapbody, cfg_doc_mapbody, &cfg_rep_map, newzones_clausesets }; @@ -2297,7 +2277,7 @@ static cfg_type_t cfg_type_filter_aaaa = { static keyword_type_t key_kw = { "key", &cfg_type_astring }; -LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_keyref = { +cfg_type_t cfg_type_keyref = { "keyref", parse_keyvalue, print_keyvalue, doc_keyvalue, &cfg_rep_string, &key_kw }; @@ -3057,7 +3037,7 @@ rndcconf_clausesets[] = { NULL }; -LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_rndcconf = { +cfg_type_t cfg_type_rndcconf = { "rndcconf", cfg_parse_mapbody, cfg_print_mapbody, cfg_doc_mapbody, &cfg_rep_map, rndcconf_clausesets }; @@ -3074,7 +3054,7 @@ rndckey_clausesets[] = { NULL }; -LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_rndckey = { +cfg_type_t cfg_type_rndckey = { "rndckey", cfg_parse_mapbody, cfg_print_mapbody, cfg_doc_mapbody, &cfg_rep_map, rndckey_clausesets }; @@ -3083,7 +3063,7 @@ LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_rndckey = { * session.key has exactly the same syntax as rndc.key, but it's defined * separately for clarity (and so we can extend it someday, if needed). */ -LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_sessionkey = { +cfg_type_t cfg_type_sessionkey = { "sessionkey", cfg_parse_mapbody, cfg_print_mapbody, cfg_doc_mapbody, &cfg_rep_map, rndckey_clausesets }; diff --git a/usr.sbin/bind/lib/isccfg/parser.c b/usr.sbin/bind/lib/isccfg/parser.c index 6f45bb5c005..225a6e25ae0 100644 --- a/usr.sbin/bind/lib/isccfg/parser.c +++ b/usr.sbin/bind/lib/isccfg/parser.c @@ -111,17 +111,17 @@ parser_complain(cfg_parser_t *pctx, isc_boolean_t is_warning, * not need a union member). */ -LIBISCCFG_EXTERNAL_DATA cfg_rep_t cfg_rep_uint32 = { "uint32", free_noop }; -LIBISCCFG_EXTERNAL_DATA cfg_rep_t cfg_rep_uint64 = { "uint64", free_noop }; -LIBISCCFG_EXTERNAL_DATA cfg_rep_t cfg_rep_string = { "string", free_string }; -LIBISCCFG_EXTERNAL_DATA cfg_rep_t cfg_rep_boolean = { "boolean", free_noop }; -LIBISCCFG_EXTERNAL_DATA cfg_rep_t cfg_rep_map = { "map", free_map }; -LIBISCCFG_EXTERNAL_DATA cfg_rep_t cfg_rep_list = { "list", free_list }; -LIBISCCFG_EXTERNAL_DATA cfg_rep_t cfg_rep_tuple = { "tuple", free_tuple }; -LIBISCCFG_EXTERNAL_DATA cfg_rep_t cfg_rep_sockaddr = { "sockaddr", free_noop }; -LIBISCCFG_EXTERNAL_DATA cfg_rep_t cfg_rep_netprefix = { "netprefix", free_noop }; -LIBISCCFG_EXTERNAL_DATA cfg_rep_t cfg_rep_void = { "void", free_noop }; -LIBISCCFG_EXTERNAL_DATA cfg_rep_t cfg_rep_fixedpoint = { "fixedpoint", free_noop }; +cfg_rep_t cfg_rep_uint32 = { "uint32", free_noop }; +cfg_rep_t cfg_rep_uint64 = { "uint64", free_noop }; +cfg_rep_t cfg_rep_string = { "string", free_string }; +cfg_rep_t cfg_rep_boolean = { "boolean", free_noop }; +cfg_rep_t cfg_rep_map = { "map", free_map }; +cfg_rep_t cfg_rep_list = { "list", free_list }; +cfg_rep_t cfg_rep_tuple = { "tuple", free_tuple }; +cfg_rep_t cfg_rep_sockaddr = { "sockaddr", free_noop }; +cfg_rep_t cfg_rep_netprefix = { "netprefix", free_noop }; +cfg_rep_t cfg_rep_void = { "void", free_noop }; +cfg_rep_t cfg_rep_fixedpoint = { "fixedpoint", free_noop }; /* * Configuration type definitions. @@ -682,7 +682,7 @@ cfg_obj_isvoid(const cfg_obj_t *obj) { return (ISC_TF(obj->type->rep == &cfg_rep_void)); } -LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_void = { +cfg_type_t cfg_type_void = { "void", cfg_parse_void, cfg_print_void, cfg_doc_void, &cfg_rep_void, NULL }; @@ -761,7 +761,7 @@ cfg_obj_asfixedpoint(const cfg_obj_t *obj) { return (obj->value.uint32); } -LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_fixedpoint = { +cfg_type_t cfg_type_fixedpoint = { "fixedpoint", cfg_parse_fixedpoint, cfg_print_fixedpoint, cfg_doc_terminal, &cfg_rep_fixedpoint, NULL }; @@ -823,7 +823,7 @@ cfg_obj_asuint32(const cfg_obj_t *obj) { return (obj->value.uint32); } -LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_uint32 = { +cfg_type_t cfg_type_uint32 = { "integer", cfg_parse_uint32, cfg_print_uint32, cfg_doc_terminal, &cfg_rep_uint32, NULL }; @@ -853,7 +853,7 @@ cfg_print_uint64(cfg_printer_t *pctx, const cfg_obj_t *obj) { cfg_print_cstr(pctx, buf); } -LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_uint64 = { +cfg_type_t cfg_type_uint64 = { "64_bit_integer", NULL, cfg_print_uint64, cfg_doc_terminal, &cfg_rep_uint64, NULL }; @@ -1070,19 +1070,19 @@ cfg_obj_asstring(const cfg_obj_t *obj) { } /* Quoted string only */ -LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_qstring = { +cfg_type_t cfg_type_qstring = { "quoted_string", cfg_parse_qstring, print_qstring, cfg_doc_terminal, &cfg_rep_string, NULL }; /* Unquoted string only */ -LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_ustring = { +cfg_type_t cfg_type_ustring = { "string", parse_ustring, cfg_print_ustring, cfg_doc_terminal, &cfg_rep_string, NULL }; /* Any string (quoted or unquoted); printed with quotes */ -LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_astring = { +cfg_type_t cfg_type_astring = { "string", cfg_parse_astring, print_qstring, cfg_doc_terminal, &cfg_rep_string, NULL }; @@ -1091,7 +1091,7 @@ LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_astring = { * Any string (quoted or unquoted); printed with quotes. * If CFG_PRINTER_XKEY is set when printing the string will be '?' out. */ -LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_sstring = { +cfg_type_t cfg_type_sstring = { "string", cfg_parse_sstring, print_sstring, cfg_doc_terminal, &cfg_rep_string, NULL }; @@ -1167,7 +1167,7 @@ cfg_print_boolean(cfg_printer_t *pctx, const cfg_obj_t *obj) { cfg_print_chars(pctx, "no", 2); } -LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_boolean = { +cfg_type_t cfg_type_boolean = { "boolean", cfg_parse_boolean, cfg_print_boolean, cfg_doc_terminal, &cfg_rep_boolean, NULL }; @@ -1969,7 +1969,7 @@ parse_token(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { return (result); } -LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_token = { +cfg_type_t cfg_type_token = { "token", parse_token, cfg_print_ustring, cfg_doc_terminal, &cfg_rep_string, NULL }; @@ -2018,7 +2018,7 @@ parse_unsupported(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { return (result); } -LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_unsupported = { +cfg_type_t cfg_type_unsupported = { "unsupported", parse_unsupported, cfg_print_spacelist, cfg_doc_terminal, &cfg_rep_list, NULL }; @@ -2270,27 +2270,27 @@ cfg_doc_netaddr(cfg_printer_t *pctx, const cfg_type_t *type) { cfg_print_chars(pctx, " )", 2); } -LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_netaddr = { +cfg_type_t cfg_type_netaddr = { "netaddr", parse_netaddr, cfg_print_sockaddr, cfg_doc_netaddr, &cfg_rep_sockaddr, &netaddr_flags }; -LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_netaddr4 = { +cfg_type_t cfg_type_netaddr4 = { "netaddr4", parse_netaddr, cfg_print_sockaddr, cfg_doc_netaddr, &cfg_rep_sockaddr, &netaddr4_flags }; -LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_netaddr4wild = { +cfg_type_t cfg_type_netaddr4wild = { "netaddr4wild", parse_netaddr, cfg_print_sockaddr, cfg_doc_netaddr, &cfg_rep_sockaddr, &netaddr4wild_flags }; -LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_netaddr6 = { +cfg_type_t cfg_type_netaddr6 = { "netaddr6", parse_netaddr, cfg_print_sockaddr, cfg_doc_netaddr, &cfg_rep_sockaddr, &netaddr6_flags }; -LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_netaddr6wild = { +cfg_type_t cfg_type_netaddr6wild = { "netaddr6wild", parse_netaddr, cfg_print_sockaddr, cfg_doc_netaddr, &cfg_rep_sockaddr, &netaddr6wild_flags }; @@ -2380,7 +2380,7 @@ cfg_obj_asnetprefix(const cfg_obj_t *obj, isc_netaddr_t *netaddr, *prefixlen = obj->value.netprefix.prefixlen; } -LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_netprefix = { +cfg_type_t cfg_type_netprefix = { "netprefix", cfg_parse_netprefix, print_netprefix, cfg_doc_terminal, &cfg_rep_netprefix, NULL }; @@ -2438,14 +2438,14 @@ parse_sockaddrsub(cfg_parser_t *pctx, const cfg_type_t *type, } static unsigned int sockaddr_flags = CFG_ADDR_V4OK | CFG_ADDR_V6OK; -LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_sockaddr = { +cfg_type_t cfg_type_sockaddr = { "sockaddr", cfg_parse_sockaddr, cfg_print_sockaddr, cfg_doc_sockaddr, &cfg_rep_sockaddr, &sockaddr_flags }; static unsigned int sockaddrdscp_flags = CFG_ADDR_V4OK | CFG_ADDR_V6OK | CFG_ADDR_DSCPOK; -LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_sockaddrdscp = { +cfg_type_t cfg_type_sockaddrdscp = { "sockaddr", cfg_parse_sockaddr, cfg_print_sockaddr, cfg_doc_sockaddr, &cfg_rep_sockaddr, &sockaddrdscp_flags }; |