Merge branch 'master' of gnunet.org:gnunet

4 files changed, 17 insertions, 9 deletions

diff --git a/src/dns/dnsstub.c b/src/dns/dnsstub.c
index f9dc7a696..6aa2d7b8f 100644
--- a/src/dns/dnsstub.c
+++ b/src/dns/dnsstub.c
@@ -621,6 +621,11 @@ void
 GNUNET_DNSSTUB_resolve_cancel (struct GNUNET_DNSSTUB_RequestSocket *rs)
 {
   rs->rc = NULL;
+  if (NULL != rs->retry_task)
+  {
+    GNUNET_SCHEDULER_cancel (rs->retry_task);
+    rs->retry_task = NULL;
+  }
 }
 
 
diff --git a/src/gns/gnunet-gns-proxy-setup-ca b/src/gns/gnunet-gns-proxy-setup-ca
index 692cca974..72d478a50 100644
--- a/src/gns/gnunet-gns-proxy-setup-ca
+++ b/src/gns/gnunet-gns-proxy-setup-ca
@@ -2,9 +2,9 @@
 # This shell script will generate an X509 certificate for your gnunet-gns-proxy
 # and install it (for both GNUnet and your browser).
 #
-if ! which certtool > /dev/null
+if ! which certutil > /dev/null
 then
-  echo "'certtool' command not found. Please install it."
+  echo "'certutil' command not found. Please install it."
   exit 1
 fi
 
@@ -41,10 +41,10 @@ echo "Making private key available to gnunet-gns-proxy"
 cat $GNSCERT $GNSCANO > $GNS_CA_CERT_PEM
 
 echo "Importing CA into browsers"
-for f in ~/.mozilla/firefox/*.default/
+for f in ~/.mozilla/firefox/*.*/
 do
   if [ -d $f ]; then
-    echo "Importing CA info Firefox at $f/"
+    echo "Importing CA info Firefox at $f"
 # delete old certificate (if any)
     certutil -D -n "GNS Proxy CA" -d "$f" >/dev/null 2>/dev/null
 # add new certificate
diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c
index d0edb82e5..94819b040 100644
--- a/src/gns/gnunet-service-gns_resolver.c
+++ b/src/gns/gnunet-service-gns_resolver.c
@@ -1940,6 +1940,9 @@ handle_gns_resolution_result (void *cls,
       return;
     case GNUNET_GNSRECORD_TYPE_GNS2DNS:
       {
+        /* TODO: Right now we only foward the request to ONE DNS resolver,
+           even if we get multiple IP addresses back; a correct implementation
+           should try all DNS resolvers. */
         /* resolution continues within DNS */
         struct Gns2DnsContext *g2dc;
         char *ip;
diff --git a/src/namestore/gnunet-zoneimport.c b/src/namestore/gnunet-zoneimport.c
index 0148f42a7..4f4151c94 100644
--- a/src/namestore/gnunet-zoneimport.c
+++ b/src/namestore/gnunet-zoneimport.c
@@ -165,9 +165,9 @@ struct Request
 
   /**
    * Namestore operation pending for this record.
-   */ 
+   */
   struct GNUNET_NAMESTORE_QueueEntry *qe;
-  
+
   /**
    * Zone responsible for this request.
    */
@@ -476,7 +476,7 @@ check_for_glue (void *cls,
     }
     if (NULL ==
         inet_ntop (AF_INET,
-                   &rec->data.raw.data,
+                   rec->data.raw.data,
                    ip,
                    ip_size))
     {
@@ -510,7 +510,7 @@ check_for_glue (void *cls,
     }
     if (NULL ==
         inet_ntop (AF_INET6,
-                   &rec->data.raw.data,
+                   rec->data.raw.data,
                    ip,
                    ip_size))
     {
@@ -1135,7 +1135,7 @@ ns_lookup_result_cb (void *cls,
                      const struct GNUNET_GNSRECORD_Data *rd)
 {
   struct Request *req = cls;
-  
+
   req->qe = NULL;
   GNUNET_break (0 == memcmp (zone,
                              &req->zone->key,