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

[gnunet]

Author: wachs
Date: 2013-11-13 16:37:43 +0100 (Wed, 13 Nov 2013)
New Revision: 30669

Modified:
   gnunet/src/namestore/gnunet-service-namestore.c
   gnunet/src/namestore/test_namestore_api_lookup_nick.c
Log:
remove private flag


Modified: gnunet/src/namestore/gnunet-service-namestore.c
===================================================================
--- gnunet/src/namestore/gnunet-service-namestore.c     2013-11-13 15:17:10 UTC 
(rev 30668)
+++ gnunet/src/namestore/gnunet-service-namestore.c     2013-11-13 15:37:43 UTC 
(rev 30669)
@@ -534,6 +534,7 @@
   nick = get_nick_record (zone_key);
   if ((NULL != nick) && (0 != strcmp(name, GNUNET_GNS_MASTERZONE_STR)))
   {
+    nick->flags = (nick->flags | GNUNET_GNSRECORD_RF_PRIVATE) ^ 
GNUNET_GNSRECORD_RF_PRIVATE;
     merge_records (rd_count,rd, 1, nick, &res_count, &res);
     GNUNET_free (nick);
   }
@@ -724,6 +725,7 @@
         /* Merge */
         rd_res = NULL;
         rdc_res = 0;
+        rlc->nick->flags = (rlc->nick->flags | GNUNET_GNSRECORD_RF_PRIVATE) ^ 
GNUNET_GNSRECORD_RF_PRIVATE;
         merge_records (rd_count, rd,
                        1, rlc->nick,
                        &rdc_res, &rd_res);

Modified: gnunet/src/namestore/test_namestore_api_lookup_nick.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_lookup_nick.c       2013-11-13 
15:17:10 UTC (rev 30668)
+++ gnunet/src/namestore/test_namestore_api_lookup_nick.c       2013-11-13 
15:37:43 UTC (rev 30669)
@@ -150,7 +150,7 @@
         endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL );
         return;
       }
-      if (rd[c].flags != GNUNET_GNSRECORD_RF_PRIVATE)
+      if (0 != (rd[c].flags & GNUNET_GNSRECORD_RF_PRIVATE))
       {
         GNUNET_break(0);
         GNUNET_SCHEDULER_cancel (endbadly_task);