[Opendnssec-commits] [svn.opendnssec.org/svn/dnssec] r5417 - branches/OpenDNSSEC-1.3/signer/src/daemon

Matthijs Mekking matthijs at nlnetlabs.nl
Tue Aug 16 12:49:40 CEST 2011


Author: matthijs
Date: 2011-08-16 12:49:40 +0200 (Tue, 16 Aug 2011)
New Revision: 5417

Modified:
   branches/OpenDNSSEC-1.3/signer/src/daemon/worker.c
Log:
assertion failure (ods 1.3.0) reported by Miek



Modified: branches/OpenDNSSEC-1.3/signer/src/daemon/worker.c
===================================================================
--- branches/OpenDNSSEC-1.3/signer/src/daemon/worker.c	2011-08-16 10:48:36 UTC (rev 5416)
+++ branches/OpenDNSSEC-1.3/signer/src/daemon/worker.c	2011-08-16 10:49:40 UTC (rev 5417)
@@ -198,6 +198,7 @@
             }
 
             if (status == ODS_STATUS_OK) {
+                zone->prepared = 1;
                 task->interrupt = TASK_NONE;
                 task->halted = TASK_NONE;
             } else {
@@ -214,7 +215,14 @@
             ods_log_verbose("[%s[%i]] read zone %s",
                 worker2str(worker->type), worker->thread_num,
                 task_who2str(task->who));
-            status = tools_input(zone);
+            if (!zone->prepared) {
+                ods_log_debug("[%s[%i]] no valid signconf.xml for zone %s yet",
+                    worker2str(worker->type), worker->thread_num,
+                    task_who2str(task->who));
+                status = ODS_STATUS_ERR;
+            } else {
+                status = tools_input(zone);
+            }
 
             /* what to do next */
             what = TASK_NSECIFY;




More information about the Opendnssec-commits mailing list