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

[gnunet]

Author: grothoff
Date: 2012-03-21 17:12:46 +0100 (Wed, 21 Mar 2012)
New Revision: 20661

Modified:
   gnunet/src/namestore/gnunet-namestore.c
   gnunet/src/namestore/gnunet-service-namestore.c
Log:
-allow deletion without specifying expiration

Modified: gnunet/src/namestore/gnunet-namestore.c
===================================================================
--- gnunet/src/namestore/gnunet-namestore.c     2012-03-21 16:00:28 UTC (rev 
20660)
+++ gnunet/src/namestore/gnunet-namestore.c     2012-03-21 16:12:46 UTC (rev 
20661)
@@ -355,11 +355,11 @@
       GNUNET_SCHEDULER_shutdown ();
       return;     
     }
-  } else if (add | del)
+  } else if (add)
   {
     fprintf (stderr,
             _("Missing option `%s' for operation `%s'\n"),
-            "-e", _("add/del"));
+            "-e", _("add"));
     GNUNET_SCHEDULER_shutdown ();
     return;     
   }
@@ -377,7 +377,7 @@
     rd.data_size = data_size;
     rd.record_type = type;
     rd.expiration = GNUNET_TIME_relative_to_absolute (etime);
-    rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY; // FIXME: not always...
+    rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
     add_qe = GNUNET_NAMESTORE_record_create (ns,
                                             zone_pkey,
                                             name,
@@ -398,8 +398,8 @@
     rd.data = data;
     rd.data_size = data_size;
     rd.record_type = type;
-    rd.expiration = GNUNET_TIME_relative_to_absolute (etime);
-    rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY; // FIXME: not always...
+    rd.expiration.abs_value = 0;
+    rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
     del_qe = GNUNET_NAMESTORE_record_remove (ns,
                                             zone_pkey,
                                             name,

Modified: gnunet/src/namestore/gnunet-service-namestore.c
===================================================================
--- gnunet/src/namestore/gnunet-service-namestore.c     2012-03-21 16:00:28 UTC 
(rev 20660)
+++ gnunet/src/namestore/gnunet-service-namestore.c     2012-03-21 16:12:46 UTC 
(rev 20661)
@@ -1016,8 +1016,6 @@
   found = GNUNET_SYSERR;
   for (c = 0; c < rd_count; c++)
   {
-    if (rd[c].expiration.abs_value != rrc->rd->expiration.abs_value)
-      continue;
     GNUNET_break(0);
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "SENT FLAGES: %u \n",rd[c].flags);
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "STORED FLAGES: %u 
\n",rrc->rd->flags);