[master] 4754. [bug] dns_zone_setview needs a two stage commit to properly

handle errors. [RT #45841]
This commit is contained in:
Evan Hunt
2017-10-04 23:44:08 -07:00
parent abaa9755d2
commit c370305901
16 changed files with 578 additions and 123 deletions

View File

@@ -0,0 +1,35 @@
/*
* Copyright (C) 2013, 2016 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/.
*/
key rndc_key {
secret "1234abcd8765";
algorithm hmac-sha256;
};
controls {
inet 10.53.0.3 port 9953 allow { any; } keys { rndc_key; };
};
options {
port 5300;
pid-file "named.pid";
listen-on { 10.53.0.3; };
listen-on-v6 { none; };
allow-query { any; };
recursion no;
allow-new-zones yes;
};
zone "." {
type master;
file "redirect.db";
};
masters "testmaster" {
192.5.5.241;
};

View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2013, 2016 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
@@ -20,10 +20,7 @@ options {
pid-file "named.pid";
listen-on { 10.53.0.3; };
listen-on-v6 { none; };
allow-query { any; };
recursion no;
};
zone "." {
type master;
file "redirect.db";
allow-new-zones yes;
};