From 034b49a8acff10793ecf0628d29f05efbbeac1c7 Mon Sep 17 00:00:00 2001
From: Tomas Hozza <thozza@redhat.com>
Date: Oct 30 2013 11:41:51 +0000
Subject: Added session-keyfile statement into default named.conf since we use /run/named


Since we don't use default /var/run/named path for PID file, we should not
use it also for Dynamic DNS session key.

Therefore the following line was added into the named.conf:
session-keyfile "/run/named/session.key";

Signed-off-by: Tomas Hozza <thozza@redhat.com>

---

diff --git a/.gitignore b/.gitignore
index 6417023..2e289d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,4 @@ bind-9.7.2b1.tar.gz
 /bind-9.9.3.tar.gz
 /bind-9.9.3-P1.tar.gz
 /bind-9.9.3-P2.tar.gz
+/config-12.tar.bz2
diff --git a/bind.spec b/bind.spec
index 79d836e..76461b9 100644
--- a/bind.spec
+++ b/bind.spec
@@ -799,6 +799,7 @@ rm -rf ${RPM_BUILD_ROOT}
 * Wed Oct 30 2013 Tomas Hozza <thozza@redhat.com> 32:9.9.3-11.P2
 - Use upstream version of patch for previously fixed #794940
 - Create symlink /var/named/chroot/var/run -> /var/named/chroot/run
+- Added session-keyfile statement into default named.conf since we use /run/named
 
 * Fri Oct 18 2013 Tomas Hozza <thozza@redhat.com> 32:9.9.3-10.P2
 - Fix race condition on send buffers in dighost.c (#794940)
diff --git a/named.conf.sample b/named.conf.sample
index 038e712..03df07e 100644
--- a/named.conf.sample
+++ b/named.conf.sample
@@ -71,7 +71,10 @@ options
 	/* Enable DLV by default, use built-in ISC DLV key. */
 	dnssec-lookaside auto;
 
+	/* In Fedora we use /run/named instead of default /var/run/named
+	   so we have to configure paths properly. */
 	pid-file "/run/named/named.pid";
+	session-keyfile "/run/named/session.key";
 
 	managed-keys-directory "/var/named/dynamic";
 };
diff --git a/sources b/sources
index 4b03009..c9f5543 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 943f6de6bfdfd821aa444242c02c1322  bind-9.9.3-P2.tar.gz
-d64062a182bf71dbcae7b2e2fe2cd55b  config-11.tar.bz2
+e4315fdea56983570d3a33702e925088  config-12.tar.bz2