2767. [bug] named could crash on startup if a zone was

			configured with auto-dnssec and there was no
			key-directory. [RT #20615]

diff --git a/CHANGES b/CHANGES
index f07291c85baedb0ea4e45510fc1f00516a31b39c..5a38be3bc61ba7d5804ef0acc436a8ce5c04f69f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+2767.  [bug]           named could crash on startup if a zone was
+                       configured with auto-dnssec and there was no
+                       key-directory. [RT #20615]
+
 2766.  [bug]           isc_socket_fdwatchpoke() should only update the
                        socketmgr state if the socket is not pending on a
                        read or write.  [RT #20603]

diff --git a/lib/dns/dnssec.c b/lib/dns/dnssec.c
index 9bfef56754f94b79b6e0fa5f80fab96190db8008..cac4d6c1bc35d91e9c7a3bc21047531119e28227 100644 (file)
--- a/lib/dns/dnssec.c
+++ b/lib/dns/dnssec.c
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: dnssec.c,v 1.108 2009/10/27 03:59:45 each Exp $
+ * $Id: dnssec.c,v 1.109 2009/11/16 01:44:33 each Exp $
  */
 
 /*! \file */
@@ -1124,6 +1124,8 @@ dns_dnssec_findmatchingkeys(dns_name_t *origin, const char *directory,
        len = isc_buffer_usedlength(&b);
        namebuf[len] = '\0';
 
+       if (directory == NULL)
+               directory = ".";
        RETERR(isc_dir_open(&dir, directory));
        dir_open = ISC_TRUE;