[GNUnet-SVN] r20309 - gnunet/src/namestore

[gnunet]

Author: wachs
Date: 2012-03-06 14:16:33 +0100 (Tue, 06 Mar 2012)
New Revision: 20309

Modified:
   gnunet/src/namestore/gnunet-service-namestore.c
   gnunet/src/namestore/namestore_api.c
   gnunet/src/namestore/test_namestore_api_lookup_specific_type.c
Log:
- fix 


Modified: gnunet/src/namestore/gnunet-service-namestore.c
===================================================================
--- gnunet/src/namestore/gnunet-service-namestore.c     2012-03-06 13:01:31 UTC 
(rev 20308)
+++ gnunet/src/namestore/gnunet-service-namestore.c     2012-03-06 13:16:33 UTC 
(rev 20309)
@@ -292,7 +292,7 @@
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Found %u records for name `%s' in zone 
`%s'\n",
       copied_elements, lnc->name, GNUNET_h2s(lnc->zone));
 
-  if ((copied_elements == rd_count) && (signature != NULL))
+  if ((copied_elements == rd_count) && (NULL != signature))
     contains_signature = GNUNET_YES;
   else
     contains_signature = GNUNET_NO;

Modified: gnunet/src/namestore/namestore_api.c
===================================================================
--- gnunet/src/namestore/namestore_api.c        2012-03-06 13:01:31 UTC (rev 
20308)
+++ gnunet/src/namestore/namestore_api.c        2012-03-06 13:16:33 UTC (rev 
20309)
@@ -300,7 +300,8 @@
     signature = &msg->signature;
   if (name_len == 0)
     name = NULL;
-  if ((name != NULL) && (signature != NULL) && (rd_count > 0))
+
+  if (name != NULL)
       public_key_tmp =  &msg->public_key;
   else
       public_key_tmp = NULL;

Modified: gnunet/src/namestore/test_namestore_api_lookup_specific_type.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_lookup_specific_type.c      
2012-03-06 13:01:31 UTC (rev 20308)
+++ gnunet/src/namestore/test_namestore_api_lookup_specific_type.c      
2012-03-06 13:16:33 UTC (rev 20309)
@@ -195,14 +195,15 @@
                             const struct GNUNET_CRYPTO_RsaSignature *signature)
 {
   int failed = GNUNET_NO;
-
-  if ((NULL == zone_key) || (0 != memcmp(zone_key, &pubkey, sizeof (struct 
GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded))))
+  /* We expect zone key != NULL, name != NULL, rd_count 0, rd NULL, signature 
NULL */
+  if (NULL == zone_key)
   {
     GNUNET_break(0);
     failed = GNUNET_YES;
   }
-  if ((NULL == n) || (0 != strcmp(n, s_name)))
+  if (NULL == n)
   {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Name %s!\n", n);
     GNUNET_break(0);
     failed = GNUNET_YES;
   }