[GNUnet-SVN] r20791 - gnunet/src/gns

[gnunet]

Author: schanzen
Date: 2012-03-27 22:57:18 +0200 (Tue, 27 Mar 2012)
New Revision: 20791

Modified:
   gnunet/src/gns/gnunet-service-gns.c
   gnunet/src/gns/gnunet-service-gns_resolver.c
Log:
-cleanup


Modified: gnunet/src/gns/gnunet-service-gns.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns.c 2012-03-27 16:37:25 UTC (rev 20790)
+++ gnunet/src/gns/gnunet-service-gns.c 2012-03-27 20:57:18 UTC (rev 20791)
@@ -814,6 +814,8 @@
     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 @@
     }
   }
   
-  //put_some_records(); //FIXME for testing
-  
   /**
    * Schedule periodic put
    * for our records

Modified: gnunet/src/gns/gnunet-service-gns_resolver.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns_resolver.c        2012-03-27 16:37:25 UTC 
(rev 20790)
+++ gnunet/src/gns/gnunet-service-gns_resolver.c        2012-03-27 20:57:18 UTC 
(rev 20791)
@@ -2212,14 +2212,9 @@
      * 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 @@
 }
 
 /**
- * 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 @@
   /* Start delegation resolution in our namestore */
   resolve_delegation_ns(rh);
 }
-  
+
+
 /**
  * Shorten api from resolver
  *