From 84782740dd8e1e78dc768da5f442056e40123ff9 Mon Sep 17 00:00:00 2001
From: Tom Ford <exptom@users.noreply.github.com>
Date: Fri, 8 Jul 2016 14:32:00 +0100
Subject: [PATCH 1/2] Need unique name for the rndc reload exec

---
 manifests/zone.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/zone.pp b/manifests/zone.pp
index 07a4fca..5f22f42 100644
--- a/manifests/zone.pp
+++ b/manifests/zone.pp
@@ -114,7 +114,7 @@ define bind::zone (
         }
 
         if $zone_file_mode == 'managed' {
-            exec { "rndc reload ${_domain}":
+            exec { "rndc reload ${name}":
                 command     => "/usr/local/bin/rndc-helper reload ${name}",
                 user        => $bind_user,
                 refreshonly => true,

From 34ff2b94916a482e3669618f8e396d8734619ed6 Mon Sep 17 00:00:00 2001
From: Tom Ford <exptom@users.noreply.github.com>
Date: Fri, 8 Jul 2016 14:47:25 +0100
Subject: [PATCH 2/2] Don't use sudo (runs as root via puppet anyway)

---
 templates/rndc-helper.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/rndc-helper.erb b/templates/rndc-helper.erb
index 094f360..e7d604f 100644
--- a/templates/rndc-helper.erb
+++ b/templates/rndc-helper.erb
@@ -14,6 +14,6 @@ param_lookup "${zone_name}" | while read Z; do
   if [ $# == 1 ]; then
     echo $Z
   else
-    sudo rndc "${@:1:$(($# - 1))}" $Z
+    /usr/sbin/rndc "${@:1:$(($# - 1))}" $Z
   fi
 done