-cleanup

diff --git a/src/gns/gnunet-service-gns.c b/src/gns/gnunet-service-gns.c
index d851ef7a4c21cd82dcb2c6457a7db5580fbf7dcf..b88971b3974720d3638cd4422b7499dd97b83e85 100644 (file)
--- a/src/gns/gnunet-service-gns.c
+++ b/src/gns/gnunet-service-gns.c
@@ -814,6 +814,8 @@ run (void *cls, struct GNUNET_SERVER_Handle *server,
     GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Could not connect to DHT!\n");
   }
 
+  auto_import_pkey = GNUNET_NO;
+
   if (GNUNET_YES ==
       GNUNET_CONFIGURATION_get_value_yesno (c, "gns",
                                             "AUTO_IMPORT_PKEY"))
@@ -869,8 +871,6 @@ run (void *cls, struct GNUNET_SERVER_Handle *server,
     }
   }
   
-  //put_some_records(); //FIXME for testing
-  
   /**
    * Schedule periodic put
    * for our records

diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c
index ad630842cbab01398f70d9adf9643f9b7f6a1f87..d1cc4ccd317b616f7469798b2a114477452b593a 100644 (file)
--- a/src/gns/gnunet-service-gns_resolver.c
+++ b/src/gns/gnunet-service-gns_resolver.c
@@ -2212,14 +2212,9 @@ process_zone_to_name_shorten(void *cls,
      * continue with next authority
      */
     next_authority = rh->authority_chain_head;
-    //                         strlen(next_authority->name) + 2);
-    memset(next_authority_name, 0, strlen(rh->name)+
-                      strlen(next_authority->name) + 2);
+    
     GNUNET_snprintf(next_authority_name, MAX_DNS_NAME_LENGTH,
                     "%s.%s", rh->name, next_authority->name);
-    //strcpy(next_authority_name, rh->name);
-    //strcpy(next_authority_name+strlen(rh->name)+1, ".");
-    //strcpy(next_authority_name+strlen(rh->name)+2, next_authority->name);
     
     strcpy(rh->name, next_authority_name);
     GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
@@ -2239,12 +2234,12 @@ process_zone_to_name_shorten(void *cls,
 }
 
 /**
- * DHT resolution for delegation finished. Processing result.
+ * DHT resolution for delegation. Processing result.
  *
  * @param cls the closure
  * @param rh resolver handle
- * @param rd_count number of results (always 0)
- * @param rd record data (always NULL)
+ * @param rd_count number of results
+ * @param rd record data
  */
 static void
 handle_delegation_dht_bg_shorten(void* cls, struct ResolverHandle *rh,
@@ -2431,7 +2426,8 @@ process_zone_to_name_zkey(void *cls,
   /* Start delegation resolution in our namestore */
   resolve_delegation_ns(rh);
 }
-  
+
+
 /**
  * Shorten api from resolver
  *