Merge branch 'na-revert-removal-of-controls.conf' into 'master'

Revert removal of bin/tests/system/common/controls.conf, it's still needed

See merge request isc-projects/bind9!62
This commit is contained in:
Ondřej Surý
2018-02-23 04:08:56 -05:00
2 changed files with 20 additions and 0 deletions

View File

@@ -0,0 +1,19 @@
/*
* Copyright (C) 2000, 2001, 2004, 2007, 2013, 2016, 2018 Internet Systems Consortium, Inc. ("ISC")
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
/* $Id: controls.conf,v 1.6 2007/06/19 23:47:01 tbox Exp $ */
key rndc_key {
secret "1234abcd8765";
algorithm hmac-sha256;
};
controls {
inet 10.53.0.2 port 9953 allow { any; } keys { rndc_key; };
};

View File

@@ -1044,6 +1044,7 @@
./bin/tests/system/clean.sh SH 2015,2016,2018
./bin/tests/system/cleanall.sh SH 2000,2001,2004,2007,2012,2014,2015,2016,2017,2018
./bin/tests/system/cleanpkcs11.sh SH 2010,2012,2014,2016
./bin/tests/system/common/controls.conf CONF-C 2000,2001,2004,2007,2013,2016,2018
./bin/tests/system/common/controls.conf.in CONF-C 2000,2001,2004,2007,2013,2016,2018
./bin/tests/system/common/rndc.conf CONF-C 2000,2001,2004,2007,2013,2016
./bin/tests/system/common/rndc.key CONF-C 2011,2013,2016