From: Ondřej Surý <ondrej@sury.org>
Date: Wed, 11 Oct 2017 06:37:36 +0000 (+0200)
Subject: [master] make writable directory and managed-keys directory mandatory - check in... 
X-Git-Tag: v9.12.0b1~29
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=1ca7e01aa741f2238690d7d9e247293187af79c8;p=thirdparty%2Fbind9.git

[master] make writable directory and managed-keys directory mandatory - check in load_configuration (cherry-picked from rt46077b)
---

diff --git a/bin/named/server.c b/bin/named/server.c
index ee0f5972267..23b22e31f6a 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -8481,10 +8481,12 @@ load_configuration(const char *filename, named_server_t *server,
 	/*
 	 * Check that the working directory is writable.
 	 */
-	if (access(".", W_OK) != 0) {
+	if (access(".", W_OK|X_OK) != 0) {
 		isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
 			      NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR,
 			      "the working directory is not writable");
+		result = ISC_R_NOPERM;
+		goto cleanup;
 	}
 
 #ifdef HAVE_LMDB