|
 |
e07df0 |
From f6b9f4dfa61038a353f3974ec7683231fa23ed21 Mon Sep 17 00:00:00 2001
|
|
|
e07df0 |
From: Petr Mensik <pemensik@redhat.com>
|
|
|
e07df0 |
Date: Wed, 11 Mar 2020 17:36:51 +0100
|
|
|
e07df0 |
Subject: [PATCH] Allow conflicting files in zones, warn only
|
|
|
e07df0 |
|
|
|
e07df0 |
Change hard error to just annoying warning. Broken configuration is
|
|
|
e07df0 |
still error, but it was possible before. Make it possible again.
|
|
|
e07df0 |
Would be fixed by using in-view clause properly.
|
|
|
e07df0 |
---
|
|
|
e07df0 |
lib/bind9/check.c | 4 ++--
|
|
|
e07df0 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
e07df0 |
|
|
|
e07df0 |
diff --git a/lib/bind9/check.c b/lib/bind9/check.c
|
|
|
e07df0 |
index 545e3c6..b02a894 100644
|
|
|
e07df0 |
--- a/lib/bind9/check.c
|
|
|
e07df0 |
+++ b/lib/bind9/check.c
|
|
|
e07df0 |
@@ -2650,11 +2650,11 @@ fileexist(const cfg_obj_t *obj, isc_symtab_t *symtab, isc_boolean_t writeable,
|
|
|
e07df0 |
if (writeable) {
|
|
|
e07df0 |
file = cfg_obj_file(symvalue.as_cpointer);
|
|
|
e07df0 |
line = cfg_obj_line(symvalue.as_cpointer);
|
|
|
e07df0 |
- cfg_obj_log(obj, logctx, ISC_LOG_ERROR,
|
|
|
e07df0 |
+ cfg_obj_log(obj, logctx, ISC_LOG_WARNING,
|
|
|
e07df0 |
"writeable file '%s': already in use: "
|
|
|
e07df0 |
"%s:%u", cfg_obj_asstring(obj),
|
|
|
e07df0 |
file, line);
|
|
|
e07df0 |
- return (ISC_R_EXISTS);
|
|
|
e07df0 |
+ return (ISC_R_SUCCESS); // Pretend it is ok
|
|
|
e07df0 |
}
|
|
|
e07df0 |
result = isc_symtab_lookup(symtab, cfg_obj_asstring(obj), 2,
|
|
|
e07df0 |
&symvalue);
|
|
|
e07df0 |
--
|
|
|
e07df0 |
2.21.1
|
|
|
e07df0 |
|