From 48865bf02282be5dcb8e06a166004bb3b4ded1da Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Wed, 1 Nov 2017 11:55:37 +1100
Subject: [PATCH] fix merge error

---
 bin/named/server.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/named/server.c b/bin/named/server.c
index df8692032b..05d2a4cac1 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -1054,7 +1054,7 @@ configure_view_dnsseckeys(dns_view_t *view, const cfg_obj_t *vconfig,
 			goto cleanup;
 		}
 
-		if (!isc_file_isdirwritable(directory)) {
+		if (!isc_file_isdirwritable(cwd)) {
 			isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
 				      NS_LOGMODULE_SERVER, ISC_LOG_ERROR,
 				      "working directory '%s' "