Thu May 2 14:57:01 2019 UTC ()

Fix one more writable directory check to "directory" in options seciton
when named is reloaded case.


(taca)

diff -r1.5 -r1.6 src/external/mpl/bind/dist/bin/named/server.c

--- src/external/mpl/bind/dist/bin/named/server.c 2019/04/28 00:01:13	1.5
+++ src/external/mpl/bind/dist/bin/named/server.c 2019/05/02 14:57:01	1.6

 @@ -1,14 +1,14 @@
-/*	$NetBSD: server.c,v 1.5 2019/04/28 00:01:13 christos Exp $	*/
+/*	$NetBSD: server.c,v 1.6 2019/05/02 14:57:01 taca Exp $	*/
 /*
  * Copyright (C) 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/.
+ *
  * See the COPYRIGHT file distributed with this work for additional
  * information regarding copyright ownership.
  */
 /*! \file */
 @@ -6456,33 +6456,35 @@ directory_callback(const char *clausenam
 	UNUSED(arg);
 	UNUSED(clausename);
 	/*
 	 * Change directory.
 	 */
 	directory = cfg_obj_asstring(obj);
 	if (! isc_file_ischdiridempotent(directory))
 		cfg_obj_log(obj, named_g_lctx, ISC_LOG_WARNING,
 			    "option 'directory' contains relative path '%s'",
 			    directory);
 #if 0
 	if (!isc_file_isdirwritable(directory)) {
 		isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
 			      NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR,
 			      "directory '%s' is not writable",
 			      directory);
 		return (ISC_R_NOPERM);
+	}
 #endif
 	result = isc_dir_chdir(directory);
 	if (result != ISC_R_SUCCESS) {
 		cfg_obj_log(obj, named_g_lctx, ISC_LOG_ERROR,
 			    "change directory to '%s' failed: %s",
 			    directory, isc_result_totext(result));
 		return (result);
+	}
 	return (ISC_R_SUCCESS);
+}
 static isc_result_t