[Opendnssec-commits] [svn.opendnssec.org/svn/dnssec] r5408 - in branches/OpenDNSSEC-1.3/signer/src: daemon parser signer tools

Matthijs Mekking matthijs at nlnetlabs.nl
Tue Aug 16 10:15:16 CEST 2011


Author: matthijs
Date: 2011-08-16 10:15:16 +0200 (Tue, 16 Aug 2011)
New Revision: 5408

Modified:
   branches/OpenDNSSEC-1.3/signer/src/daemon/cmdhandler.c
   branches/OpenDNSSEC-1.3/signer/src/daemon/engine.c
   branches/OpenDNSSEC-1.3/signer/src/parser/zonelistparser.c
   branches/OpenDNSSEC-1.3/signer/src/signer/rrset.h
   branches/OpenDNSSEC-1.3/signer/src/tools/zone_fetcher.c
Log:
nit changes from trunk



Modified: branches/OpenDNSSEC-1.3/signer/src/daemon/cmdhandler.c
===================================================================
--- branches/OpenDNSSEC-1.3/signer/src/daemon/cmdhandler.c	2011-08-16 07:46:28 UTC (rev 5407)
+++ branches/OpenDNSSEC-1.3/signer/src/daemon/cmdhandler.c	2011-08-16 08:15:16 UTC (rev 5408)
@@ -207,6 +207,7 @@
         /* [LOCK] zonelist */
         zone = zonelist_lookup_zone_by_name(cmdc->engine->zonelist, tbd,
             LDNS_RR_CLASS_IN);
+        /* If this zone is just added, don't update (it might not have a task yet) */
         if (zone && zone->just_added) {
             zone = NULL;
         }
@@ -303,6 +304,7 @@
         /* [LOCK] zonelist */
         zone = zonelist_lookup_zone_by_name(cmdc->engine->zonelist, tbd,
             LDNS_RR_CLASS_IN);
+        /* If this zone is just added, don't update (it might not have a task yet) */
         if (zone && zone->just_added) {
             zone = NULL;
         }

Modified: branches/OpenDNSSEC-1.3/signer/src/daemon/engine.c
===================================================================
--- branches/OpenDNSSEC-1.3/signer/src/daemon/engine.c	2011-08-16 07:46:28 UTC (rev 5407)
+++ branches/OpenDNSSEC-1.3/signer/src/daemon/engine.c	2011-08-16 08:15:16 UTC (rev 5408)
@@ -659,6 +659,11 @@
     /* set up hsm */ /* LEAK */
     result = hsm_open(engine->config->cfg_filename, hsm_prompt_pin, NULL);
     if (result != HSM_OK) {
+        char *error =  hsm_get_error(NULL);
+        if (error != NULL) {
+            ods_log_error("[%s] %s", engine_str, error);
+            free(error);
+        }
         ods_log_error("[%s] error initializing libhsm (errno %i)",
             engine_str, result);
         return ODS_STATUS_HSM_ERR;

Modified: branches/OpenDNSSEC-1.3/signer/src/parser/zonelistparser.c
===================================================================
--- branches/OpenDNSSEC-1.3/signer/src/parser/zonelistparser.c	2011-08-16 07:46:28 UTC (rev 5407)
+++ branches/OpenDNSSEC-1.3/signer/src/parser/zonelistparser.c	2011-08-16 08:15:16 UTC (rev 5408)
@@ -227,9 +227,12 @@
             if (doc == NULL || xpathCtx == NULL) {
                 ods_log_error("[%s] unable to read zone %s; skipping",
                    parser_str, zone_name);
+                ret = xmlTextReaderRead(reader);
                 free((void*) zone_name);
-                ret = xmlTextReaderRead(reader);
                 free((void*) tag_name);
+                if (xpathCtx) {
+                    xmlXPathFreeContext(xpathCtx);
+                }
                 continue;
             }
 

Modified: branches/OpenDNSSEC-1.3/signer/src/signer/rrset.h
===================================================================
--- branches/OpenDNSSEC-1.3/signer/src/signer/rrset.h	2011-08-16 07:46:28 UTC (rev 5407)
+++ branches/OpenDNSSEC-1.3/signer/src/signer/rrset.h	2011-08-16 08:15:16 UTC (rev 5408)
@@ -161,7 +161,7 @@
  * \param[in] rrset RRset
  * \param[in] owner owner of the zone
  * \param[in] sc signer configuration
- * \param[in] signtime time when the zone is being signd
+ * \param[in] signtime time when the zone is being signed
  * \param[out] stats update statistics
  * \return ods_status status
  *

Modified: branches/OpenDNSSEC-1.3/signer/src/tools/zone_fetcher.c
===================================================================
--- branches/OpenDNSSEC-1.3/signer/src/tools/zone_fetcher.c	2011-08-16 07:46:28 UTC (rev 5407)
+++ branches/OpenDNSSEC-1.3/signer/src/tools/zone_fetcher.c	2011-08-16 08:15:16 UTC (rev 5408)
@@ -704,15 +704,6 @@
             }
 #endif
 #endif /* IPV6_V6ONLY */
-/*
-            if (setsockopt(sockets->udp[i].s, SOL_SOCKET, SO_REUSEADDR, &on,
-                sizeof(on)) < 0) {
-                ods_log_error("zone fetcher setsockopt(..., SO_REUSEADDR, ...) "
-                    "failed for "
-                    "%s:%s (%s)", node?node:"(null)", port?port:"(null)",
-                    strerror(errno));
-            }
-*/
             if (fcntl(sockets->udp[i].s, F_SETFL, O_NONBLOCK) == -1) {
                 ods_log_error("zone fetcher cannot fcntl udp/6 socket for "
                     "%s:%s (%s)", node?node:"(null)", port?port:"(null)",




More information about the Opendnssec-commits mailing list