2727. [func] The 'key-directory' option can now specify a relative

			path. [RT #20154]

diff --git a/CHANGES b/CHANGES
index b2cc363be405ae826fa029b33de07e16cb9e3c9e..073154d949409d4228b714c9aba60667fee15b55 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2727.  [func]          The 'key-directory' option can now specify a relative
+                       path. [RT #20154]
+
 2726.  [func]          Added support for SHA-2 DNSSEC algorithms,
                        RSASHA256 and RSASHA512. [RT #20023]
 

diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
index b2a893cbc10c88f2cdd15c41f0ce4e3bfc58b5df..ce615d5cac5c636c34f7de2302f448e934b76520 100644 (file)
--- a/bin/named/zoneconf.c
+++ b/bin/named/zoneconf.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zoneconf.c,v 1.158 2009/10/12 23:48:01 tbox Exp $ */
+/* $Id: zoneconf.c,v 1.159 2009/10/22 03:43:16 each Exp $ */
 
 /*% */
 
@@ -830,12 +830,6 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
                result = ns_config_get(maps, "key-directory", &obj);
                if (result == ISC_R_SUCCESS) {
                        filename = cfg_obj_asstring(obj);
-                       if (!isc_file_isabsolute(filename)) {
-                               cfg_obj_log(obj, ns_g_lctx, ISC_LOG_ERROR,
-                                           "key-directory '%s' "
-                                           "is not absolute", filename);
-                               return (ISC_R_FAILURE);
-                       }
                        RETERR(dns_zone_setkeydirectory(zone, filename));
                }
 

diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index c1764ab2f5f3b32d74001467e1eb48e5b1188183..b5e16f595fdcb3b7eea3d68e50c00adc8b3a54ea 100644 (file)
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- File: $Id: Bv9ARM-book.xml,v 1.438 2009/10/22 02:04:07 each Exp $ -->
+<!-- File: $Id: Bv9ARM-book.xml,v 1.439 2009/10/22 03:43:16 each Exp $ -->
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <title>BIND 9 Administrator Reference Manual</title>
 
@@ -5165,9 +5165,8 @@ badresp:1,adberr:0,findfail:0,valfail:0]
                 When performing dynamic update of secure zones, the
                 directory where the public and private DNSSEC key files
                 should be found, if different than the current working
-                directory.  The directory specified must be an absolute
-                path.  (Note that this option has no effect on the paths
-                for files containing non-DNSSEC keys such as
+                directory.  (Note that this option has no effect on the
+                paths for files containing non-DNSSEC keys such as
                 <filename>bind.keys</filename>,
                 <filename>rndc.key</filename> or
                 <filename>session.key</filename>.)