Commit ecf6dcc5 authored by Mark Andrews's avatar Mark Andrews Committed by Evan Hunt
Browse files

[master] fix rpzrecurse test on windows

4887.	[test]		Enable the rpzrecurse test to run on Windows.
			[RT #47093]
parent cc82b5aa
4887. [test] Enable the rpzrecurse test to run on Windows.
[RT #47093]
4886. [doc] Document dig -u in manpage. [RT #47150]
 
4885. [security] update-policy rules that otherwise ignore the name
......
......@@ -114,7 +114,8 @@ named_control_docommand(isccc_sexpr_t *message, isc_boolean_t readonly,
/*
* Compare the 'command' parameter against all known control commands.
*/
if (command_compare(command, NAMED_COMMAND_NULL) ||
if ((command_compare(command, NAMED_COMMAND_NULL) &&
strlen(cmdline) == 4) ||
command_compare(command, NAMED_COMMAND_STATUS))
{
log_level = ISC_LOG_DEBUG(1);
......
......@@ -125,6 +125,8 @@ else
TESTSOCK6=false
fi
# Windows process management leave empty
PSSUSPEND=
PYTHON=@PYTHON@
......@@ -231,6 +233,7 @@ export PIPEQUERIES
export PK11DEL
export PK11GEN
export PK11LIST
export PSSUSPEND
export PYTHON
export RANDFILE
export RESOLVE
......
......@@ -130,7 +130,11 @@ else
TESTSOCK6=false
fi
#
# PsSuspend is part of PSTools and can be downloaded from
# https://download.sysinternals.com/files/PSTools.zip
#
PSSUSPEND=@PSSUSPEND@
PYTHON=@PYTHON@
#
......@@ -221,6 +225,7 @@ export PIPEQUERIES
export PK11DEL
export PK11GEN
export PK11LIST
export PSSUSPEND
export PYTHON
export RANDFILE
export RESOLVE
......
......@@ -17,3 +17,4 @@ rm -f ns2/named.conf
rm -f ns3/named.conf
rm -f ns*/*core *core
rm -f dnsrps*.conf dnsrpzd*
rm -f ns*/session.key
......@@ -19,6 +19,15 @@ options {
querylog yes;
};
key rndc_key {
secret "1234abcd8765";
algorithm hmac-sha256;
};
controls {
inet 10.53.0.1 port 9953 allow { any; } keys { rndc_key; };
};
zone "." {
type master;
file "root.db";
......
......@@ -19,6 +19,7 @@ while getopts "xD" c; do
case $c in
x) set -x; DEBUG=-x;;
D) TEST_DNSRPS="-D";;
N) NOCLEAN=set;;
*) echo "$USAGE" 1>&2; exit 1;;
esac
done
......@@ -28,7 +29,7 @@ if test "$#" -ne 0; then
exit 1
fi
$SHELL clean.sh $DEBUG
[ ${NOCLEAN:-unset} = unset ] && $SHELL clean.sh $DEBUG
$PERL testgen.pl
cp -f ns2/named.default.conf ns2/named.conf
......
This diff is collapsed.
......@@ -344,6 +344,7 @@ my @substvar = ("BIND9_VERSION",
"PLATFORM",
"PKCS11_TOOLS",
"prefix",
"PSSUSPEND",
"PYTHON",
"PYTHON_INSTALL_DIR",
"VCREDIST_PATH"),
......@@ -412,6 +413,7 @@ my @withlist = ("aes",
"openssl",
"libxml2",
"pkcs11",
"pssuspend",
"python",
"readline",
"samples",
......@@ -469,6 +471,7 @@ my @help = (
" with-gssapi[=PATH] build with MIT KfW GSSAPI yes|no|path\n",
" with-libxml2[=PATH] build with libxml2 library yes|no|path\n",
" with-geoip[=PATH] build with GeoIP support yes|no|path\n",
" with-pssuspend[=COMMAND] specify pssuspend command\n",
" with-python[=COMMAND] specify python interpreter python|command\n",
" with-readline[=PATH] build with readline library support yes|no|path\n",
" with-idn[=PATH] build with IDN kit support yes|no|path\n",
......@@ -520,6 +523,8 @@ my $use_geoip = "no";
my $geoip_path = "";
my $use_libxml2 = "auto";
my $libxml2_path = "..\\..\\";
my $with_pssuspend = "no";
my $pssuspend_command = "pssuspend.exe";
my $use_python = "auto";
my $python_command = "python.exe";
my $use_readline = "no";
......@@ -875,6 +880,14 @@ sub mywith {
$zlib_path = $val;
}
}
} elsif ($key =~ /^pssuspend$/i) {
if ($val =~ /^no$/i) {
$with_pssuspend = "no";
} else {
if ($val !~ /^yes$/i) {
$pssuspend_command = $val;
}
}
} elsif ($key =~ /^python$/i) {
if ($val =~ /^no$/i) {
$use_python = "no";
......@@ -1103,6 +1116,11 @@ if ($verbose) {
} else {
print "zlib-path: $zlib_path\n";
}
if ($with_pssuspend eq "no") {
print "pssuspend: disabled\n";
} else {
print "pssuspend-command: $pssuspend_command\n";
}
if ($use_python eq "no") {
print "python: disabled\n";
} else {
......@@ -2487,6 +2505,10 @@ if ($use_zlib eq "no") {
$configdll{"ZLIB_DLL"} = "$zlib_dll";
}
if ($with_pssuspend ne "no") {
$configvar{"PSSUSPEND"} = "$pssuspend_command";
}
# with-python
if ($use_python eq "no") {
if ($verbose) {
......
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