Commit 82e68ffb authored by Ondřej Surý's avatar Ondřej Surý

Add VALIDATION_DEFAULT to Windows Configure script

parent 18c3a084
Pipeline #2191 passed with stages
in 8 minutes and 8 seconds
......@@ -130,7 +130,6 @@ config.@O@: config.c
-DDYNDB_LIBDIR=\"@libdir@/bind\" \
-DNAMED_LOCALSTATEDIR=\"${localstatedir}\" \
-DNAMED_SYSCONFDIR=\"${sysconfdir}\" \
-DVALIDATION_DEFAULT=\"@VALIDATION_DEFAULT@\" \
-c ${srcdir}/config.c
server.@O@: server.c
......
......@@ -617,6 +617,9 @@ int sigwait(const unsigned int *set, int *sig);
non-blocking. */
#undef USE_FIONBIO_IOCTL
/* the default value of dnssec-validation option */
#undef VALIDATION_DEFAULT
/* Define to enable very verbose query trace logging. */
#undef WANT_QUERYTRACE
......
......@@ -402,6 +402,9 @@ typedef __int64 off_t;
/* Large system tuning */
@TUNE_LARGE@
/* the default value of dnssec-validation option */
@VALIDATION_DEFAULT@
/* Verbose query trace logging */
@WANT_QUERYTRACE@
......
......@@ -677,7 +677,6 @@ BIND9_ISCCFG_BUILDINCLUDE
BIND9_ISCCC_BUILDINCLUDE
BIND9_ISC_BUILDINCLUDE
BIND9_TOP_BUILDDIR
VALIDATION_DEFAULT
UNITTESTS
ATFLIBS
ATFBIN
......@@ -22558,27 +22557,21 @@ esac
#
# Was --disable-auto-validation specified?
#
validation_default=auto
# Check whether --enable-auto-validation was given.
if test "${enable_auto_validation+set}" = set; then :
enableval=$enable_auto_validation; want_autoval="$enableval"
enableval=$enable_auto_validation; :
else
want_autoval="yes"
enable_auto_validation=yes
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable DNSSEC validation by default" >&5
$as_echo_n "checking whether to enable DNSSEC validation by default... " >&6; }
case "$want_autoval" in
no)
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
VALIDATION_DEFAULT=yes
;;
*)
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
VALIDATION_DEFAULT=auto
;;
esac
if test "$enable_auto_validation" = "no"; then :
validation_default=yes
fi
cat >>confdefs.h <<_ACEOF
#define VALIDATION_DEFAULT "$validation_default"
_ACEOF
#
......
......@@ -4625,22 +4625,13 @@ esac
#
# Was --disable-auto-validation specified?
#
validation_default=auto
AC_ARG_ENABLE(auto-validation,
AS_HELP_STRING([--enable-auto-validation],
[turn on DNSSEC validation by default, using the IANA root key [default=yes]]),
want_autoval="$enableval", want_autoval="yes")
AC_MSG_CHECKING([whether to enable DNSSEC validation by default])
case "$want_autoval" in
no)
AC_MSG_RESULT(no)
VALIDATION_DEFAULT=yes
;;
*)
AC_MSG_RESULT(yes)
VALIDATION_DEFAULT=auto
;;
esac
AC_SUBST(VALIDATION_DEFAULT)
[:],[enable_auto_validation=yes])
AS_IF([test "$enable_auto_validation" = "no"],[validation_default=yes])
AC_DEFINE_UNQUOTED([VALIDATION_DEFAULT], ["$validation_default"], [the default value of dnssec-validation option])
#
# Substitutions
......
......@@ -223,7 +223,8 @@ my @substdefh = ("AES_CC",
"ISC_LIST_CHECKINIT",
"TUNE_LARGE",
"WANT_QUERYTRACE",
"WITH_IDN");
"WITH_IDN",
"VALIDATION_DEFAULT");
# for platform.h
......@@ -486,6 +487,7 @@ my $use_ed448 = "auto";
my $use_aes = "auto";
my $cookie_algorithm = "aes";
my $use_gssapi = "no";
my $validation_default = "auto";
my $gssapi_path = "C:\\Program\ Files\\MIT\\Kerberos\\";
my $use_geoip = "no";
my $geoip_path = "";
......@@ -702,6 +704,10 @@ sub myenable {
if ($val =~ /^no$/i) {
$enable_rpz_nsdname = "no";
}
} elsif ($key =~ /^auto-validation$/i) {
if ($val =~ /^no$/i) {
$validation_default = "yes";
}
} else {
$want_unknown = "yes";
if ($val eq "no") {
......@@ -2032,6 +2038,9 @@ if ($use_gssapi ne "yes") {
$configdefd{"USE_ISC_SPNEGO"} = "USE_ISC_SPNEGO";
}
# disable-auto-validation
$configdefh{"VALIDATION_DEFAULT"} = "\"$validation_default\"";
# with-geoip
if ($use_geoip eq "no") {
if ($verbose) {
......@@ -3249,6 +3258,7 @@ exit 0;
# --enable-full-report supported by verbose
# --enable-dnstap not supported (requires libfstrm support on WIN32)
# --enable-afl not supported (not yet available on Visual Studio C++)
# --disable-auto-validation supported
# --with-python supported
# --with-openssl supported
# --with-pkcs11 supported
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment