1234. [bug] contrib/sdb: 'zonetodb' failed to call

                        dns_result_register().  DNS_R_SEENINCLUDE should not
                        be fatal.

diff --git a/CHANGES b/CHANGES
index 355a35b5dfcd4ca7e175aa1156d88881d83ca20c..2451243fc0ac10ed1a63496d8b29ae0a7c47259d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+1234.  [bug]           contrib/sdb: 'zonetodb' failed to call
+                       dns_result_register().  DNS_R_SEENINCLUDE should not
+                       be fatal.
+
 1233.  [bug]           The flags field of a KEY record can be expressed in
                        hex as well as decimal.
 

diff --git a/contrib/sdb/pgsql/zonetodb.c b/contrib/sdb/pgsql/zonetodb.c
index 2259d0b4a94f942eddeef2b091ab4c2b4ddb49e9..3e179f34444bbb3e399294ba88e4983b54af4f5d 100644 (file)
--- a/contrib/sdb/pgsql/zonetodb.c
+++ b/contrib/sdb/pgsql/zonetodb.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zonetodb.c,v 1.10 2001/03/17 01:53:01 bwelling Exp $ */
+/* $Id: zonetodb.c,v 1.11 2002/03/19 03:32:08 marka Exp $ */
 
 #include <isc/buffer.h>
 #include <isc/mem.h>
@@ -151,6 +151,8 @@ main(int argc, char **argv) {
        dbname = argv[3];
        dbtable = argv[4];
 
+       dns_result_register();
+
        mctx = NULL;
        result = isc_mem_create(0, 0, &mctx);
        check_result(result, "isc_mem_create");
@@ -168,6 +170,8 @@ main(int argc, char **argv) {
        check_result(result, "dns_db_create");
 
        result = dns_db_load(db, zonefile);
+       if (result == DNS_R_SEENINCLUDE)
+               result = ISC_R_SUCCESS;
        check_result(result, "dns_db_load");
 
        printf("Connecting to '%s'\n", dbname);