mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 14:07:59 +00:00
Code Issues Releases Wiki Activity

Add VALIDATION_DEFAULT to Windows Configure script

Browse Source
This commit is contained in:
Ondřej Surý
2018-06-06 12:02:40 +02:00
parent 18c3a08471
commit 82e68ffbf0
6 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bin/named/Makefile.in
View File

@@ -130,7 +130,6 @@ config.@O@: config.c
-DDYNDB_LIBDIR=\"@libdir@/bind\" \ -DDYNDB_LIBDIR=\"@libdir@/bind\" \
-DNAMED_LOCALSTATEDIR=\"${localstatedir}\" \ -DNAMED_LOCALSTATEDIR=\"${localstatedir}\" \
-DNAMED_SYSCONFDIR=\"${sysconfdir}\" \ -DNAMED_SYSCONFDIR=\"${sysconfdir}\" \
-DVALIDATION_DEFAULT=\"@VALIDATION_DEFAULT@\" \
-c ${srcdir}/config.c -c ${srcdir}/config.c
server.@O@: server.c server.@O@: server.c

3
config.h.in
View File

@@ -617,6 +617,9 @@ int sigwait(const unsigned int *set, int *sig);
non-blocking. */ non-blocking. */
#undef USE_FIONBIO_IOCTL #undef USE_FIONBIO_IOCTL
/* the default value of dnssec-validation option */
#undef VALIDATION_DEFAULT
/* Define to enable very verbose query trace logging. */ /* Define to enable very verbose query trace logging. */
#undef WANT_QUERYTRACE #undef WANT_QUERYTRACE

3
config.h.win32
View File

@@ -402,6 +402,9 @@ typedef __int64 off_t;
/* Large system tuning */ /* Large system tuning */
@TUNE_LARGE@ @TUNE_LARGE@
/* the default value of dnssec-validation option */
@VALIDATION_DEFAULT@
/* Verbose query trace logging */ /* Verbose query trace logging */
@WANT_QUERYTRACE@ @WANT_QUERYTRACE@

27
configure vendored
View File

@@ -677,7 +677,6 @@ BIND9_ISCCFG_BUILDINCLUDE
BIND9_ISCCC_BUILDINCLUDE BIND9_ISCCC_BUILDINCLUDE
BIND9_ISC_BUILDINCLUDE BIND9_ISC_BUILDINCLUDE
BIND9_TOP_BUILDDIR BIND9_TOP_BUILDDIR
VALIDATION_DEFAULT
UNITTESTS UNITTESTS
ATFLIBS ATFLIBS
ATFBIN ATFBIN
@@ -22558,27 +22557,21 @@ esac
# #
# Was --disable-auto-validation specified? # Was --disable-auto-validation specified?
# #
validation_default=auto
# Check whether --enable-auto-validation was given. # Check whether --enable-auto-validation was given.
if test "${enable_auto_validation+set}" = set; then : if test "${enable_auto_validation+set}" = set; then :
enableval=$enable_auto_validation; want_autoval="$enableval" enableval=$enable_auto_validation; :
else else
want_autoval="yes" enable_auto_validation=yes
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable DNSSEC validation by default" >&5 if test "$enable_auto_validation" = "no"; then :
$as_echo_n "checking whether to enable DNSSEC validation by default... " >&6; } validation_default=yes
case "$want_autoval" in fi
no)
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 cat >>confdefs.h <<_ACEOF
$as_echo "no" >&6; } #define VALIDATION_DEFAULT "$validation_default"
VALIDATION_DEFAULT=yes _ACEOF
;;
*)
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
VALIDATION_DEFAULT=auto
;;
esac
# #

17
configure.in
View File

@@ -4625,22 +4625,13 @@ esac
# #
# Was --disable-auto-validation specified? # Was --disable-auto-validation specified?
# #
validation_default=auto
AC_ARG_ENABLE(auto-validation, AC_ARG_ENABLE(auto-validation,
AS_HELP_STRING([--enable-auto-validation], AS_HELP_STRING([--enable-auto-validation],
[turn on DNSSEC validation by default, using the IANA root key [default=yes]]), [turn on DNSSEC validation by default, using the IANA root key [default=yes]]),
want_autoval="$enableval", want_autoval="yes") [:],[enable_auto_validation=yes])
AC_MSG_CHECKING([whether to enable DNSSEC validation by default]) AS_IF([test "$enable_auto_validation" = "no"],[validation_default=yes])
case "$want_autoval" in AC_DEFINE_UNQUOTED([VALIDATION_DEFAULT], ["$validation_default"], [the default value of dnssec-validation option])
no)
AC_MSG_RESULT(no)
VALIDATION_DEFAULT=yes
;;
*)
AC_MSG_RESULT(yes)
VALIDATION_DEFAULT=auto
;;
esac
AC_SUBST(VALIDATION_DEFAULT)
# #
# Substitutions # Substitutions

12
win32utils/Configure
View File

@@ -223,7 +223,8 @@ my @substdefh = ("AES_CC",
"ISC_LIST_CHECKINIT", "ISC_LIST_CHECKINIT",
"TUNE_LARGE", "TUNE_LARGE",
"WANT_QUERYTRACE", "WANT_QUERYTRACE",
"WITH_IDN"); "WITH_IDN",
"VALIDATION_DEFAULT");
# for platform.h # for platform.h
@@ -486,6 +487,7 @@ my $use_ed448 = "auto";
my $use_aes = "auto"; my $use_aes = "auto";
my $cookie_algorithm = "aes"; my $cookie_algorithm = "aes";
my $use_gssapi = "no"; my $use_gssapi = "no";
my $validation_default = "auto";
my $gssapi_path = "C:\\Program\ Files\\MIT\\Kerberos\\"; my $gssapi_path = "C:\\Program\ Files\\MIT\\Kerberos\\";
my $use_geoip = "no"; my $use_geoip = "no";
my $geoip_path = ""; my $geoip_path = "";
@@ -702,6 +704,10 @@ sub myenable {
if ($val =~ /^no$/i) { if ($val =~ /^no$/i) {
$enable_rpz_nsdname = "no"; $enable_rpz_nsdname = "no";
} }
} elsif ($key =~ /^auto-validation$/i) {
if ($val =~ /^no$/i) {
$validation_default = "yes";
}
} else { } else {
$want_unknown = "yes"; $want_unknown = "yes";
if ($val eq "no") { if ($val eq "no") {
@@ -2032,6 +2038,9 @@ if ($use_gssapi ne "yes") {
$configdefd{"USE_ISC_SPNEGO"} = "USE_ISC_SPNEGO"; $configdefd{"USE_ISC_SPNEGO"} = "USE_ISC_SPNEGO";
} }
# disable-auto-validation
$configdefh{"VALIDATION_DEFAULT"} = "\"$validation_default\"";
# with-geoip # with-geoip
if ($use_geoip eq "no") { if ($use_geoip eq "no") {
if ($verbose) { if ($verbose) {
@@ -3249,6 +3258,7 @@ exit 0;
# --enable-full-report supported by verbose # --enable-full-report supported by verbose
# --enable-dnstap not supported (requires libfstrm support on WIN32) # --enable-dnstap not supported (requires libfstrm support on WIN32)
# --enable-afl not supported (not yet available on Visual Studio C++) # --enable-afl not supported (not yet available on Visual Studio C++)
# --disable-auto-validation supported
# --with-python supported # --with-python supported
# --with-openssl supported # --with-openssl supported
# --with-pkcs11 supported # --with-pkcs11 supported