-fix double cleanup

2 files changed, 9 insertions, 1 deletions

diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c
index 61a6b8ddd..567b6e593 100644
--- a/src/gns/gnunet-gns-proxy.c
+++ b/src/gns/gnunet-gns-proxy.c
@@ -1615,6 +1615,8 @@ mhd_log_callback (void *cls,
         return NULL;
       }
       s5r->url = GNUNET_strdup (url);
+      GNUNET_SCHEDULER_cancel (s5r->timeout_task);
+      s5r->timeout_task = GNUNET_SCHEDULER_NO_TASK;
       return s5r;
     }
   }
diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c
index 3a3324da8..ceb570ae6 100644
--- a/src/gns/gnunet-service-gns_resolver.c
+++ b/src/gns/gnunet-service-gns_resolver.c
@@ -580,6 +580,9 @@ transmit_lookup_dns_result (struct GNS_ResolverHandle *rh)
       i++;
     }
     GNUNET_assert (i == n);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+                "Transmitting standard DNS result with %u records\n",
+                n);
     rh->proc (rh->proc_cls,
               n,
               rd);
@@ -1755,7 +1758,10 @@ start_resolver_lookup (struct GNS_ResolverHandle *rh)
     default:
       af = AF_UNSPEC;
       break;
-    }
+    }  
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+                "Doing standard DNS lookup for `%s'\n",
+                rh->name);
     rh->std_resolve = GNUNET_RESOLVER_ip_get (rh->name, 
                                               af,
                                               DNS_LOOKUP_TIMEOUT,