- reverting api change

1 files changed, 0 insertions, 30 deletions

diff --git a/src/namestore/gnunet-namestore.c b/src/namestore/gnunet-namestore.c
index 9829eaaa4..4f7dc161b 100644
--- a/src/namestore/gnunet-namestore.c
+++ b/src/namestore/gnunet-namestore.c
@@ -104,10 +104,6 @@ static char *typestring;
  */
 static char *expirationstring;
 
-/**
- * Desired block expiration time.
- */
-static char *blockexpirationstring;
 
 /**
  * Task run on shutdown.  Cleans up everything.
@@ -261,7 +257,6 @@ run (void *cls, char *const *args, const char *cfgfile,
   void *data = NULL;
   size_t data_size = 0;
   struct GNUNET_TIME_Relative etime;
-  struct GNUNET_TIME_Relative btime;
   struct GNUNET_NAMESTORE_RecordData rd;
 
   if (NULL == keyfile)
@@ -359,27 +354,6 @@ run (void *cls, char *const *args, const char *cfgfile,
     GNUNET_SCHEDULER_shutdown ();
     return;     
   }
-  if (NULL != blockexpirationstring)
-  {
-    if (GNUNET_OK !=
-        GNUNET_STRINGS_fancy_time_to_relative (blockexpirationstring,
-                                               &btime))
-    {
-      fprintf (stderr,
-               _("Invalid time format `%s'\n"),
-               blockexpirationstring);
-      GNUNET_SCHEDULER_shutdown ();
-      return;
-    }
-  } else if (add | del)
-  {
-    fprintf (stderr,
-             _("Missing option `%s' for operation `%s'\n"),
-             "-b", _("add/del"));
-    GNUNET_SCHEDULER_shutdown ();
-    return;
-  }
-
   if (add)
   {
     if (NULL == name)
@@ -397,7 +371,6 @@ run (void *cls, char *const *args, const char *cfgfile,
     rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY; // FIXME: not always...
     add_qe = GNUNET_NAMESTORE_record_create (ns,
                                              zone_pkey,
-                                             GNUNET_TIME_relative_to_absolute (btime),
                                              name,
                                              &rd,
                                              &add_continuation,
@@ -451,9 +424,6 @@ main (int argc, char *const *argv)
     {'a', "add", NULL,
      gettext_noop ("add record"), 0,
      &GNUNET_GETOPT_set_one, &add},
-    {'b', "name-expiration", "TIME",
-     gettext_noop ("expiration time for name to use (for adding only)"), 1,
-     &GNUNET_GETOPT_set_string, &blockexpirationstring},
     {'d', "delete", NULL,
      gettext_noop ("delete record"), 0,
      &GNUNET_GETOPT_set_one, &del},