- fix

diff --git a/src/namestore/gnunet-service-namestore.c b/src/namestore/gnunet-service-namestore.c
index b72dcd0738e97dc51dcd0b632a0e90acc85c22ac..f7c5a320573b4278f536c6d2437e820947cb002b 100644 (file)
--- a/src/namestore/gnunet-service-namestore.c
+++ b/src/namestore/gnunet-service-namestore.c
@@ -292,7 +292,7 @@ handle_lookup_name_it (void *cls,
   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;

diff --git a/src/namestore/namestore_api.c b/src/namestore/namestore_api.c
index 49ab4b4425c39d9ae0b1314957ddb4dfd0763aad..f96fc88cf4c08ed9bc32c6c94a02240ac757872a 100644 (file)
--- a/src/namestore/namestore_api.c
+++ b/src/namestore/namestore_api.c
@@ -300,7 +300,8 @@ handle_lookup_name_response (struct GNUNET_NAMESTORE_QueueEntry *qe,
     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;

diff --git a/src/namestore/test_namestore_api_lookup_specific_type.c b/src/namestore/test_namestore_api_lookup_specific_type.c
index 3f209885837757d4d629dcb851af3f4934d66fc7..a74c602f221a371308726c9c931e28e7f15e0afd 100644 (file)
--- a/src/namestore/test_namestore_api_lookup_specific_type.c
+++ b/src/namestore/test_namestore_api_lookup_specific_type.c
@@ -195,14 +195,15 @@ void name_lookup_non_existing_record_type (void *cls,
                             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;
   }