Merge branch 'master' of git+ssh://git.gnunet.org/gnunet

5 files changed, 669 insertions, 415 deletions

diff --git a/doc/man/gnunet-namestore.1 b/doc/man/gnunet-namestore.1
index 9391e21bb..6915aed6e 100644
--- a/doc/man/gnunet-namestore.1
+++ b/doc/man/gnunet-namestore.1
@@ -43,9 +43,8 @@
 .Op Fl o | -omit-private
 .Op Fl P | -purge-orphans
 .Op Fl p | -public
-.Op Fl r Ar PKEY | Fl -reverse= Ns Ar PKEY
-.Op Fl R Ar RECORDLINE | Fl -replace= Ns Ar RECORDLINE
 .Op Fl s | -shadow
+.Op Fl S | -from-stdin
 .Op Fl T | -include-maintenance
 .Op Fl t Ar TYPE | Fl -type= Ns Ar TYPE
 .Op Fl u Ar URI | Fl -uri= Ns Ar URI
@@ -53,6 +52,7 @@
 .Op Fl V Ar VALUE | Fl -value= Ns Ar VALUE
 .Op Fl X | -purge-zone-records
 .Op Fl z Ar EGO | Fl -zone= Ns Ar EGO
+.Op Fl Z Ar KEY | Fl -zone-to-name= Ns Ar KEY
 .Sh DESCRIPTION
 .Nm
 can be used to manipulate records in a GNS zone.
@@ -102,23 +102,42 @@ Delete orphaned records from namestore.
 .It Fl p | -public
 Create a record that is public (shared with other users that know the
 label).
-.It Fl r Ar PKEY | Fl -reverse= Ns Ar PKEY
-Determine our GNS name for the given public key (reverse lookup of the
-PKEY) in the given zone.
-.It Fl R Ar RECORDLINE | Fl -replace= Ns Ar RECORDLINE
-Sets record set to values given in RECORDLINE.
-This option can be specified multiple times to provide multiple
-records for the record set.
-Existing records under the same label will be deleted.
-The format for the RECORDLINE is "TTL TYPE FLAGS VALUE" where TTL is
-the time to live in seconds (unit must not be given explicitly,
-seconds is always implied), TYPE is the DNS/GNS record type,
-FLAGS is "(N)ORMAL", "(S)HADOW" or "(P)UBLIC".
-The VALUE follows the usual human-readable value format(s) of DNS/GNS.
+.It Fl r | -recordline
+Changes the output format of zones and records to recordline.
 .It Fl s | -shadow
 Create a record that is a shadow record.
 Shadow records are only used once all other records of the same type
 under the same label have expired.
+.It Fl S | -from-stdin
+Read recordlines from stdin until EOF is encountered.
+The format uses
+.B recordlines
+:
+A record in a recordline follows the format
+
+NAME.EGO:
+ TYPE EXPIRATION [FLAGS] VALUE
+ ...
+Multiple records may be provided for a name.
+
+EXPIRATION is given in microseconds without a unit (e.g. 3600000000 for 3600 seconds).
+
+FLAGS is a concatenation of record flags.
+Possible values for flags and their meaning are:
+.Pp
+  p: Public
+  s: Shadow
+  S: Supplemental
+  C: Critical
+  r: Relative expiration
+
+TYPE and VALUE are used in the same way as for the "-t" and "-V" options.
+Example formats for recordlines can be output using the "-D" flag combined
+with "--recordline".
+An example record set in recordline format can be found in the examples.
+It is possible to specify multiple record sets.
+Can only be used in combination with "-a" to add the parsed record sets.
+Existing record sets under names will be replaced.
 .It Fl T | -include-maintenance
 Show maintenance records such as TOMBSTONEs. Use in combination with --display.
 .It Fl t Ar TYPE | Fl -type= Ns Ar TYPE
@@ -144,8 +163,45 @@ Base32-encoding using the GNUNET_NAMESTORE_EGO_PRIVATE_KEY environment
 variable. The latter is useful to improve performance of tools like
 Ascension as it allows the command to skip IPC with the identity
 management subsystem.
+.It Fl Z Ar KEY | Fl -zone-to-name= Ns Ar KEY
+Determine our GNS name for the given public key (reverse lookup of the
+KEY) in the given zone.
 .El
-.\".Sh EXAMPLES
+.Sh EXAMPLES
+.Tp
+.Nm
+-z example -a -n www -t A -V "1.2.3.4" -e 1d -p
+.Tp
+.Pp
+.Dl Add a public record for ego "example" with name "www" containing an IP address.
+.sp
+.Tp
+.Nm
+-z example -D
+.Tp
+.Pp
+.Dl Show all records for ego "example".
+.sp
+.Tp
+.Nm
+-z example -D -r
+.Tp
+.Pp
+.Dl Show all records for ego "example" in recordline format.
+.sp
+.Tp
+.Nm
+--add --from-stdin <<EOF
+ www.alice:
+  A 3600000000 [pr] 1.2.3.4
+  TXT 3600000001 [pr] Hello World
+
+ www.bob:
+  A 12345679000000 [pr] 4.3.2.1
+ EOF
+.Tp
+.Pp
+.Dl Read record sets in recordline format from stdin.
 .\".Sh FILES
 .Sh SEE ALSO
 .Xr gnunet-gns 1 ,
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index fb2a670bc..a0ca32fa4 100644
--- a/src/namestore/Makefile.am
+++ b/src/namestore/Makefile.am
@@ -514,6 +514,7 @@ test_plugin_namestore_postgres_LDADD = \
 
 check_SCRIPTS = \
   test_namestore_put.sh \
+  test_namestore_put_stdin.sh \
   test_namestore_lookup.sh \
   test_namestore_delete.sh \
   test_namestore_zonefile_import.sh
diff --git a/src/namestore/gnunet-namestore.c b/src/namestore/gnunet-namestore.c
index 36a0a9ba3..207394dd9 100644
--- a/src/namestore/gnunet-namestore.c
+++ b/src/namestore/gnunet-namestore.c
@@ -32,6 +32,7 @@
 #include <gnunet_gnsrecord_lib.h>
 #include <gnunet_gns_service.h>
 #include <gnunet_namestore_service.h>
+#include <inttypes.h>
 
 /**
  * The upper bound for the zone iteration interval
@@ -119,11 +120,6 @@ static struct GNUNET_NAMESTORE_Handle *ns;
 static struct GNUNET_IDENTITY_PrivateKey zone_pkey;
 
 /**
- * Handle to identity lookup.
- */
-static struct GNUNET_IDENTITY_EgoLookup *el;
-
-/**
  * Identity service handle
  */
 static struct GNUNET_IDENTITY_Handle *idh;
@@ -134,11 +130,6 @@ static struct GNUNET_IDENTITY_Handle *idh;
 static char *ego_name;
 
 /**
- * Desired action is to add a record.
- */
-static int add;
-
-/**
  * Queue entry for the 'add-uri' operation.
  */
 static struct GNUNET_NAMESTORE_QueueEntry *add_qe_uri;
@@ -168,6 +159,10 @@ static struct MarkedRecord *marked_head;
  */
 static struct MarkedRecord *marked_tail;
 
+/**
+ * Configuration handle
+ */
+const struct GNUNET_CONFIGURATION_Handle *cfg;
 
 /**
  * Ego list
@@ -180,14 +175,24 @@ static struct EgoEntry *ego_head;
 static struct EgoEntry *ego_tail;
 
 /**
+ * List iterator for the 'list' operation.
+ */
+static struct GNUNET_NAMESTORE_ZoneIterator *list_it;
+
+/**
+ * Run in read from stdin mode.
+ */
+static int read_from_stdin;
+
+/**
  * Desired action is to list records.
  */
 static int list;
 
 /**
- * List iterator for the 'list' operation.
+ * Desired action is to add a record.
  */
-static struct GNUNET_NAMESTORE_ZoneIterator *list_it;
+static int add;
 
 /**
  * Desired action is to remove a record.
@@ -210,6 +215,12 @@ static int is_shadow;
 static int omit_private;
 
 /**
+ * Output in recordline format
+ */
+static int output_recordline;
+
+
+/**
  * Purge zone contents
  */
 static int purge_zone;
@@ -240,6 +251,11 @@ static struct GNUNET_NAMESTORE_QueueEntry *del_qe;
 static struct GNUNET_NAMESTORE_QueueEntry *set_qe;
 
 /**
+ * Queue entry for begin/commit
+ */
+static struct GNUNET_NAMESTORE_QueueEntry *ns_qe;
+
+/**
  * Name of the records to add/list/remove.
  */
 static char *name;
@@ -325,37 +341,193 @@ static struct RecordSetEntry *recordset;
 static struct GNUNET_SCHEDULER_Task *purge_task;
 
 /**
- * Task run on shutdown.  Cleans up everything.
+ * Parse expiration time.
  *
- * @param cls unused
+ * @param expirationstring text to parse
+ * @param[out] etime_is_rel set to #GNUNET_YES if time is relative
+ * @param[out] etime set to expiration time (abs or rel)
+ * @return #GNUNET_OK on success
  */
+static int
+parse_expiration (const char *expirationstring,
+                  int *etime_is_rel,
+                  uint64_t *etime)
+{
+  struct GNUNET_TIME_Relative etime_rel;
+  struct GNUNET_TIME_Absolute etime_abs;
+
+  if (0 == strcmp (expirationstring, "never"))
+  {
+    *etime = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us;
+    *etime_is_rel = GNUNET_NO;
+    return GNUNET_OK;
+  }
+  if (GNUNET_OK ==
+      GNUNET_STRINGS_fancy_time_to_relative (expirationstring, &etime_rel))
+  {
+    *etime_is_rel = GNUNET_YES;
+    *etime = etime_rel.rel_value_us;
+    if (GNUNET_TIME_relative_cmp (etime_rel, <, WARN_RELATIVE_EXPIRATION_LIMIT))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                  "Relative expiration times of less than %s are not recommended. To improve availability, consider increasing this value.\n",
+                  GNUNET_STRINGS_relative_time_to_string (
+                    WARN_RELATIVE_EXPIRATION_LIMIT, GNUNET_NO));
+    }
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Storing record with relative expiration time of %s\n",
+                GNUNET_STRINGS_relative_time_to_string (etime_rel, GNUNET_NO));
+    return GNUNET_OK;
+  }
+  if (GNUNET_OK ==
+      GNUNET_STRINGS_fancy_time_to_absolute (expirationstring, &etime_abs))
+  {
+    *etime_is_rel = GNUNET_NO;
+    *etime = etime_abs.abs_value_us;
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Storing record with absolute expiration time of %s\n",
+                GNUNET_STRINGS_absolute_time_to_string (etime_abs));
+    return GNUNET_OK;
+  }
+  return GNUNET_SYSERR;
+}
+
+
+static int
+parse_recordline (const char *line)
+{
+  struct RecordSetEntry **head = &recordset;
+  struct RecordSetEntry *r;
+  struct GNUNET_GNSRECORD_Data record;
+  char *cp;
+  char *tok;
+  char *saveptr;
+  void *raw_data;
+
+  cp = GNUNET_strdup (line);
+  tok = strtok_r (cp, " ", &saveptr);
+  if (NULL == tok)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _ ("Missing entries in record line `%s'.\n"),
+                line);
+    GNUNET_free (cp);
+    return GNUNET_SYSERR;
+  }
+  record.record_type = GNUNET_GNSRECORD_typename_to_number (tok);
+  if (UINT32_MAX == record.record_type)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _ ("Unknown record type `%s'\n"), tok);
+    GNUNET_free (cp);
+    return GNUNET_SYSERR;
+  }
+  tok = strtok_r (NULL, " ", &saveptr);
+  if (NULL == tok)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _ ("Empty record line argument is not allowed.\n"));
+    GNUNET_free (cp);
+    return GNUNET_SYSERR;
+  }
+  if (1 != sscanf (tok, "%" SCNu64, &record.expiration_time))
+  {
+    fprintf (stderr,
+             _ ("Error parsing expiration time %s.\n"), tok);
+    GNUNET_free (cp);
+    return GNUNET_SYSERR;
+  }
+  tok = strtok_r (NULL, " ", &saveptr);
+  if (NULL == tok)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _ ("Empty record line argument is not allowed.\n"));
+    GNUNET_free (cp);
+    return GNUNET_SYSERR;
+  }
+  record.flags = GNUNET_GNSRECORD_RF_NONE;
+  if (NULL != strchr (tok, (unsigned char) 'r'))
+    record.flags |= GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION;
+  if (NULL == strchr (tok, (unsigned char) 'p')) /* p = public */
+    record.flags |= GNUNET_GNSRECORD_RF_PRIVATE;
+  if (NULL != strchr (tok, (unsigned char) 'S'))
+    record.flags |= GNUNET_GNSRECORD_RF_SUPPLEMENTAL;
+  if (NULL != strchr (tok, (unsigned char) 's'))
+    record.flags |= GNUNET_GNSRECORD_RF_SHADOW;
+  if (NULL != strchr (tok, (unsigned char) 'C'))
+    record.flags |= GNUNET_GNSRECORD_RF_CRITICAL;
+  tok = strtok_r (NULL, " ", &saveptr);
+  if (NULL == tok)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _ ("Empty record line argument is not allowed.\n"));
+    GNUNET_free (cp);
+    return GNUNET_SYSERR;
+  }
+  if (GNUNET_OK != GNUNET_GNSRECORD_string_to_value (record.record_type,
+                                                     tok,
+                                                     &raw_data,
+                                                     &record.data_size))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _ ("Invalid record data for type %s: `%s'.\n"),
+                GNUNET_GNSRECORD_number_to_typename (record.record_type),
+                tok);
+    return GNUNET_SYSERR;
+  }
+
+  r = GNUNET_malloc (sizeof(struct RecordSetEntry) + record.data_size);
+  r->next = *head;
+  record.data = &r[1];
+  memcpy (&r[1], raw_data, record.data_size);
+  GNUNET_free (raw_data);
+  r->record = record;
+  *head = r;
+  return GNUNET_OK;
+}
+
 static void
-do_shutdown (void *cls)
+reset_handles (void)
 {
-  struct EgoEntry *ego_entry;
-  struct EgoEntry *ego_tmp;
   struct MarkedRecord *mrec;
   struct MarkedRecord *mrec_tmp;
-  (void) cls;
+  struct RecordSetEntry *rs_entry;
+
+  rs_entry = recordset;
+  while (NULL != (rs_entry = recordset))
+  {
+    recordset = recordset->next;
+    GNUNET_free (rs_entry);
+  }
+  recordset = NULL;
   if (NULL != ego_name)
   {
     GNUNET_free (ego_name);
     ego_name = NULL;
   }
-  if (NULL != purge_task)
+  if (NULL != name)
   {
-    GNUNET_SCHEDULER_cancel (purge_task);
-    purge_task = NULL;
+    GNUNET_free (name);
+    name = NULL;
   }
-  if (NULL != idh)
+  if (NULL != value)
   {
-    GNUNET_IDENTITY_disconnect (idh);
-    idh = NULL;
+    GNUNET_free (value);
+    value = NULL;
+  }
+  if (NULL != uri)
+  {
+    GNUNET_free (uri);
+    uri = NULL;
   }
-  if (NULL != el)
+  if (NULL != expirationstring)
   {
-    GNUNET_IDENTITY_ego_lookup_cancel (el);
-    el = NULL;
+    GNUNET_free (expirationstring);
+    expirationstring = NULL;
+  }
+  if (NULL != purge_task)
+  {
+    GNUNET_SCHEDULER_cancel (purge_task);
+    purge_task = NULL;
   }
   for (mrec = marked_head; NULL != mrec;)
   {
@@ -364,13 +536,6 @@ do_shutdown (void *cls)
     GNUNET_free (mrec_tmp->name);
     GNUNET_free (mrec_tmp);
   }
-  for (ego_entry = ego_head; NULL != ego_entry;)
-  {
-    ego_tmp = ego_entry;
-    ego_entry = ego_entry->next;
-    GNUNET_free (ego_tmp->identifier);
-    GNUNET_free (ego_tmp);
-  }
   if (NULL != list_it)
   {
     GNUNET_NAMESTORE_zone_iteration_stop (list_it);
@@ -401,17 +566,12 @@ do_shutdown (void *cls)
     GNUNET_NAMESTORE_cancel (del_qe);
     del_qe = NULL;
   }
-  if (NULL != ns)
+  if (NULL != reverse_qe)
   {
-    GNUNET_NAMESTORE_disconnect (ns);
-    ns = NULL;
+    GNUNET_NAMESTORE_cancel (reverse_qe);
+    reverse_qe = NULL;
   }
   memset (&zone_pkey, 0, sizeof(zone_pkey));
-  if (NULL != uri)
-  {
-    GNUNET_free (uri);
-    uri = NULL;
-  }
   if (NULL != zm)
   {
     GNUNET_NAMESTORE_zone_monitor_stop (zm);
@@ -422,18 +582,83 @@ do_shutdown (void *cls)
     GNUNET_free (data);
     data = NULL;
   }
+  if (NULL != typestring)
+  {
+    GNUNET_free (typestring);
+    typestring = NULL;
+  }
+  list = 0;
+  is_public = 0;
+  is_shadow = 0;
+  purge_zone = 0;
 }
 
 
+
 /**
- * Check if we are finished, and if so, perform shutdown.
+ * Task run on shutdown.  Cleans up everything.
+ *
+ * @param cls unused
  */
 static void
-test_finished ()
+do_shutdown (void *cls)
 {
-  if ((NULL == add_qe) && (NULL == add_qe_uri) && (NULL == get_qe) &&
-      (NULL == del_qe) && (NULL == reverse_qe) && (NULL == list_it))
-    GNUNET_SCHEDULER_shutdown ();
+  struct EgoEntry *ego_entry;
+  struct EgoEntry *ego_tmp;
+  (void) cls;
+
+  reset_handles ();
+  if (NULL != ns_qe)
+  {
+    GNUNET_NAMESTORE_cancel (ns_qe);
+    ns_qe = NULL;
+  }
+  if (NULL != ns)
+  {
+    GNUNET_NAMESTORE_disconnect (ns);
+    ns = NULL;
+  }
+  if (NULL != idh)
+  {
+    GNUNET_IDENTITY_disconnect (idh);
+    idh = NULL;
+  }
+  for (ego_entry = ego_head; NULL != ego_entry;)
+  {
+    ego_tmp = ego_entry;
+    ego_entry = ego_entry->next;
+    GNUNET_free (ego_tmp->identifier);
+    GNUNET_free (ego_tmp);
+  }
+}
+
+static void
+commit_cb (void *cls, enum GNUNET_ErrorCode ec)
+{
+  ns_qe = NULL;
+  if (GNUNET_EC_NONE != ec)
+  {
+    fprintf (stderr, "Failed to commit to namestore: `%s'\n",
+             GNUNET_ErrorCode_get_hint (ec));
+    ret = 1;
+  }
+  GNUNET_SCHEDULER_shutdown ();
+}
+
+static void
+process_command_stdin ();
+
+
+static void
+finish_command (void)
+{
+  reset_handles ();
+  if (read_from_stdin)
+  {
+    process_command_stdin ();
+    return;
+  }
+  ns_qe = GNUNET_NAMESTORE_transaction_commit (ns, &commit_cb, NULL);
 }
 
 
@@ -452,7 +677,7 @@ add_continuation (void *cls, enum GNUNET_ErrorCode ec)
       ret = 1;
   }
   ret = 0;
-  test_finished ();
+  finish_command ();
 }
 
 
@@ -467,7 +692,7 @@ del_continuation (void *cls, enum GNUNET_ErrorCode ec)
              _ ("Deleting record failed: %s\n"), GNUNET_ErrorCode_get_hint (
                ec));
   }
-  test_finished ();
+  finish_command ();
 }
 
 static void
@@ -496,7 +721,7 @@ purge_next_record (void *cls)
   if (NULL == marked_head)
   {
     ret = 0;
-    test_finished ();
+    finish_command ();
     return;
   }
   mrec = marked_head;
@@ -527,7 +752,7 @@ zone_iteration_finished (void *cls)
     return;
   }
   ret = 0;
-  test_finished ();
+  finish_command ();
 }
 
 
@@ -541,7 +766,7 @@ zone_iteration_error_cb (void *cls)
   list_it = NULL;
   fprintf (stderr, "Error iterating over zone\n");
   ret = 1;
-  test_finished ();
+  finish_command ();
 }
 
 static void
@@ -681,18 +906,33 @@ display_record (const struct GNUNET_IDENTITY_PrivateKey *zone_key,
       at.abs_value_us = rd[i].expiration_time;
       ets = GNUNET_STRINGS_absolute_time_to_string (at);
     }
-    fprintf (stdout,
-             "\t%s: %s (%s)\t%s\t%s\n",
-             typestr,
-             s,
-             ets,
-             (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_PRIVATE)) ? "PRIVATE"
+    char flgstr[16];
+    sprintf (flgstr, "[%s%s%s%s%s]",
+             (rd[i].flags & GNUNET_GNSRECORD_RF_PRIVATE) ? "" : "p",
+             (rd[i].flags & GNUNET_GNSRECORD_RF_SUPPLEMENTAL) ? "S" : "",
+             (rd[i].flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION) ? "r" : "",
+             (rd[i].flags & GNUNET_GNSRECORD_RF_SHADOW) ? "S" : "",
+             (rd[i].flags & GNUNET_GNSRECORD_RF_CRITICAL) ? "C" : "");
+    if (output_recordline)
+      fprintf (stdout,
+               "  %s %" PRIu64 " %s %s\n",
+               typestr,
+               rd[i].expiration_time,
+               flgstr,
+               s);
+    else
+      fprintf (stdout,
+               "\t%s: %s (%s)\t%s\t%s\n",
+               typestr,
+               s,
+               ets,
+               (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_PRIVATE)) ? "PRIVATE"
              : "PUBLIC",
-             (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_SHADOW)) ? "SHADOW"
+               (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_SHADOW)) ? "SHADOW"
              : "");
     GNUNET_free (s);
   }
-  fprintf (stdout, "%s", "\n");
+  // fprintf (stdout, "%s", "\n");
 }
 
 static void
@@ -797,7 +1037,7 @@ display_record_lookup (void *cls,
   (void) zone_key;
   get_qe = NULL;
   display_record (zone_key, rname, rd_len, rd);
-  test_finished ();
+  finish_command ();
 }
 
 
@@ -838,7 +1078,7 @@ lookup_error_cb (void *cls)
   (void) cls;
   get_qe = NULL;
   fprintf (stderr, "%s", "Failed to lookup record.\n");
-  test_finished ();
+  finish_command ();
 }
 
 
@@ -852,7 +1092,7 @@ add_error_cb (void *cls)
   add_qe = NULL;
   GNUNET_break (0);
   ret = 1;
-  test_finished ();
+  finish_command ();
 }
 
 
@@ -883,7 +1123,7 @@ get_existing_record (void *cls,
   {
     GNUNET_break (0);
     ret = 1;
-    test_finished ();
+    finish_command ();
     return;
   }
 
@@ -904,7 +1144,7 @@ get_existing_record (void *cls,
             "A SOA record exists already under `%s', cannot add a second SOA to the same zone.\n"),
           rec_name);
         ret = 1;
-        test_finished ();
+        finish_command ();
         return;
       }
       break;
@@ -974,7 +1214,7 @@ handle_reverse_lookup (void *cls,
     fprintf (stdout, "%s\n", reverse_pkey);
   else
     fprintf (stdout, "%s.%s\n", label, ego_name);
-  test_finished ();
+  finish_command ();
 }
 
 
@@ -988,7 +1228,7 @@ del_lookup_error_cb (void *cls)
   del_qe = NULL;
   GNUNET_break (0);
   ret = 1;
-  test_finished ();
+  finish_command ();
 }
 
 
@@ -1025,7 +1265,7 @@ del_monitor (void *cls,
                "There are no records under label `%s' that could be deleted.\n"),
              label);
     ret = 1;
-    test_finished ();
+    finish_command ();
     return;
   }
   if ((NULL == value) && (NULL == typestring))
@@ -1067,7 +1307,7 @@ del_monitor (void *cls,
       _ (
         "There are no records under label `%s' that match the request for deletion.\n"),
       label);
-    test_finished ();
+    finish_command ();
     return;
   }
   /* delete everything but what we copied to 'rdx' */
@@ -1081,59 +1321,6 @@ del_monitor (void *cls,
 }
 
 
-/**
- * Parse expiration time.
- *
- * @param expirationstring text to parse
- * @param[out] etime_is_rel set to #GNUNET_YES if time is relative
- * @param[out] etime set to expiration time (abs or rel)
- * @return #GNUNET_OK on success
- */
-static int
-parse_expiration (const char *expirationstring,
-                  int *etime_is_rel,
-                  uint64_t *etime)
-{
-  struct GNUNET_TIME_Relative etime_rel;
-  struct GNUNET_TIME_Absolute etime_abs;
-
-  if (0 == strcmp (expirationstring, "never"))
-  {
-    *etime = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us;
-    *etime_is_rel = GNUNET_NO;
-    return GNUNET_OK;
-  }
-  if (GNUNET_OK ==
-      GNUNET_STRINGS_fancy_time_to_relative (expirationstring, &etime_rel))
-  {
-    *etime_is_rel = GNUNET_YES;
-    *etime = etime_rel.rel_value_us;
-    if (GNUNET_TIME_relative_cmp (etime_rel, <, WARN_RELATIVE_EXPIRATION_LIMIT))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "Relative expiration times of less than %s are not recommended. To improve availability, consider increasing this value.\n",
-                  GNUNET_STRINGS_relative_time_to_string (
-                    WARN_RELATIVE_EXPIRATION_LIMIT, GNUNET_NO));
-    }
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Storing record with relative expiration time of %s\n",
-                GNUNET_STRINGS_relative_time_to_string (etime_rel, GNUNET_NO));
-    return GNUNET_OK;
-  }
-  if (GNUNET_OK ==
-      GNUNET_STRINGS_fancy_time_to_absolute (expirationstring, &etime_abs))
-  {
-    *etime_is_rel = GNUNET_NO;
-    *etime = etime_abs.abs_value_us;
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Storing record with absolute expiration time of %s\n",
-                GNUNET_STRINGS_absolute_time_to_string (etime_abs));
-    return GNUNET_OK;
-  }
-  return GNUNET_SYSERR;
-}
-
-
 static void
 replace_cont (void *cls, enum GNUNET_ErrorCode ec)
 {
@@ -1147,7 +1334,7 @@ replace_cont (void *cls, enum GNUNET_ErrorCode ec)
                 GNUNET_ErrorCode_get_hint (ec));
     ret = 1;   /* fail from 'main' */
   }
-  GNUNET_SCHEDULER_shutdown ();
+  finish_command ();
 }
 
 
@@ -1173,14 +1360,7 @@ run_with_zone_pkey (const struct GNUNET_CONFIGURATION_Handle *cfg)
   {
     /* nothing more to be done */
     fprintf (stderr, _ ("No options given\n"));
-    GNUNET_SCHEDULER_shutdown ();
-    return;
-  }
-  ns = GNUNET_NAMESTORE_connect (cfg);
-  if (NULL == ns)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _ ("Failed to connect to namestore\n"));
+    finish_command ();
     return;
   }
 
@@ -1190,24 +1370,23 @@ run_with_zone_pkey (const struct GNUNET_CONFIGURATION_Handle *cfg)
     unsigned int rd_count;
     struct GNUNET_GNSRECORD_Data *rd;
 
-    if (NULL == ego_name)
+    /* FIXME: We could easily support append and delete with this as well */
+    if (! add)
     {
-      fprintf (stderr,
-               _ ("Missing option `%s' for operation `%s'\n"),
-               "-z",
-               _ ("replace"));
-      GNUNET_SCHEDULER_shutdown ();
+      fprintf (stderr, _ ("Recordlines only work with option `%s'\n"),
+               "-a");
       ret = 1;
+      finish_command ();
       return;
     }
     if (NULL == name)
     {
       fprintf (stderr,
                _ ("Missing option `%s' for operation `%s'\n"),
-               "-R",
-               _ ("replace"));
-      GNUNET_SCHEDULER_shutdown ();
+               "-n",
+               _ ("name"));
       ret = 1;
+      finish_command ();
       return;
     }
     rd_count = 0;
@@ -1235,8 +1414,8 @@ run_with_zone_pkey (const struct GNUNET_CONFIGURATION_Handle *cfg)
     if (0 == strlen (nickstring))
     {
       fprintf (stderr, _ ("Invalid nick `%s'\n"), nickstring);
-      GNUNET_SCHEDULER_shutdown ();
       ret = 1;
+      finish_command ();
       return;
     }
     add = 1;
@@ -1258,8 +1437,8 @@ run_with_zone_pkey (const struct GNUNET_CONFIGURATION_Handle *cfg)
                _ ("Missing option `%s' for operation `%s'\n"),
                "-z",
                _ ("add"));
-      GNUNET_SCHEDULER_shutdown ();
       ret = 1;
+      finish_command ();
       return;
     }
     if (NULL == name)
@@ -1268,8 +1447,8 @@ run_with_zone_pkey (const struct GNUNET_CONFIGURATION_Handle *cfg)
                _ ("Missing option `%s' for operation `%s'\n"),
                "-n",
                _ ("add"));
-      GNUNET_SCHEDULER_shutdown ();
       ret = 1;
+      finish_command ();
       return;
     }
     if (NULL == typestring)
@@ -1278,16 +1457,16 @@ run_with_zone_pkey (const struct GNUNET_CONFIGURATION_Handle *cfg)
                _ ("Missing option `%s' for operation `%s'\n"),
                "-t",
                _ ("add"));
-      GNUNET_SCHEDULER_shutdown ();
       ret = 1;
+      finish_command ();
       return;
     }
     type = GNUNET_GNSRECORD_typename_to_number (typestring);
     if (UINT32_MAX == type)
     {
       fprintf (stderr, _ ("Unsupported type `%s'\n"), typestring);
-      GNUNET_SCHEDULER_shutdown ();
       ret = 1;
+      finish_command ();
       return;
     }
     if ((GNUNET_DNSPARSER_TYPE_SRV == type) ||
@@ -1297,8 +1476,8 @@ run_with_zone_pkey (const struct GNUNET_CONFIGURATION_Handle *cfg)
       fprintf (stderr,
                _ ("For DNS record types `SRV', `TLSA' and `OPENPGPKEY'"));
       fprintf (stderr, ", please use a `BOX' record instead\n");
-      GNUNET_SCHEDULER_shutdown ();
       ret = 1;
+      finish_command ();
       return;
     }
     if (NULL == value)
@@ -1308,7 +1487,7 @@ run_with_zone_pkey (const struct GNUNET_CONFIGURATION_Handle *cfg)
                "-V",
                _ ("add"));
       ret = 1;
-      GNUNET_SCHEDULER_shutdown ();
+      finish_command ();
       return;
     }
     if (GNUNET_OK !=
@@ -1318,8 +1497,8 @@ run_with_zone_pkey (const struct GNUNET_CONFIGURATION_Handle *cfg)
                _ ("Value `%s' invalid for record type `%s'\n"),
                value,
                typestring);
-      GNUNET_SCHEDULER_shutdown ();
       ret = 1;
+      finish_command ();
       return;
     }
     if (NULL == expirationstring)
@@ -1328,15 +1507,15 @@ run_with_zone_pkey (const struct GNUNET_CONFIGURATION_Handle *cfg)
                _ ("Missing option `%s' for operation `%s'\n"),
                "-e",
                _ ("add"));
-      GNUNET_SCHEDULER_shutdown ();
       ret = 1;
+      finish_command ();
       return;
     }
     if (GNUNET_OK != parse_expiration (expirationstring, &etime_is_rel, &etime))
     {
       fprintf (stderr, _ ("Invalid time format `%s'\n"), expirationstring);
-      GNUNET_SCHEDULER_shutdown ();
       ret = 1;
+      finish_command ();
       return;
     }
     add_qe = GNUNET_NAMESTORE_records_lookup (ns,
@@ -1355,8 +1534,8 @@ run_with_zone_pkey (const struct GNUNET_CONFIGURATION_Handle *cfg)
                _ ("Missing option `%s' for operation `%s'\n"),
                "-z",
                _ ("del"));
-      GNUNET_SCHEDULER_shutdown ();
       ret = 1;
+      finish_command ();
       return;
     }
     if (NULL == name)
@@ -1365,8 +1544,8 @@ run_with_zone_pkey (const struct GNUNET_CONFIGURATION_Handle *cfg)
                _ ("Missing option `%s' for operation `%s'\n"),
                "-n",
                _ ("del"));
-      GNUNET_SCHEDULER_shutdown ();
       ret = 1;
+      finish_command ();
       return;
     }
     del_qe = GNUNET_NAMESTORE_records_lookup (ns,
@@ -1398,8 +1577,8 @@ run_with_zone_pkey (const struct GNUNET_CONFIGURATION_Handle *cfg)
                _ ("Missing option `%s' for operation `%s'\n"),
                "-z",
                _ ("purge-zone"));
-      GNUNET_SCHEDULER_shutdown ();
       ret = 1;
+      finish_command ();
       return;
     }
     list_it = GNUNET_NAMESTORE_zone_iteration_start2 (ns,
@@ -1423,8 +1602,8 @@ run_with_zone_pkey (const struct GNUNET_CONFIGURATION_Handle *cfg)
                  _ ("Missing option `%s' for operation `%s'\n"),
                  "-z",
                  _ ("list"));
-        GNUNET_SCHEDULER_shutdown ();
         ret = 1;
+        finish_command ();
         return;
       }
       get_qe = GNUNET_NAMESTORE_records_lookup (ns,
@@ -1457,8 +1636,8 @@ run_with_zone_pkey (const struct GNUNET_CONFIGURATION_Handle *cfg)
                _ ("Missing option `%s' for operation `%s'\n"),
                "-z",
                _ ("reverse-pkey"));
-      GNUNET_SCHEDULER_shutdown ();
       ret = 1;
+      finish_command ();
       return;
     }
     if (GNUNET_OK !=
@@ -1468,7 +1647,9 @@ run_with_zone_pkey (const struct GNUNET_CONFIGURATION_Handle *cfg)
       fprintf (stderr,
                _ ("Invalid public key for reverse lookup `%s'\n"),
                reverse_pkey);
-      GNUNET_SCHEDULER_shutdown ();
+      ret = 1;
+      finish_command ();
+      return;
     }
     reverse_qe = GNUNET_NAMESTORE_zone_to_name (ns,
                                                 &zone_pkey,
@@ -1489,8 +1670,8 @@ run_with_zone_pkey (const struct GNUNET_CONFIGURATION_Handle *cfg)
                _ ("Missing option `%s' for operation `%s'\n"),
                "-z",
                _ ("uri"));
-      GNUNET_SCHEDULER_shutdown ();
       ret = 1;
+      finish_command ();
       return;
     }
 
@@ -1502,8 +1683,8 @@ run_with_zone_pkey (const struct GNUNET_CONFIGURATION_Handle *cfg)
          GNUNET_IDENTITY_public_key_from_string (sh, &pkey)))
     {
       fprintf (stderr, _ ("Invalid URI `%s'\n"), uri);
-      GNUNET_SCHEDULER_shutdown ();
       ret = 1;
+      finish_command ();
       return;
     }
     if (NULL == expirationstring)
@@ -1512,15 +1693,15 @@ run_with_zone_pkey (const struct GNUNET_CONFIGURATION_Handle *cfg)
                _ ("Missing option `%s' for operation `%s'\n"),
                "-e",
                _ ("add"));
-      GNUNET_SCHEDULER_shutdown ();
       ret = 1;
+      finish_command ();
       return;
     }
     if (GNUNET_OK != parse_expiration (expirationstring, &etime_is_rel, &etime))
     {
       fprintf (stderr, _ ("Invalid time format `%s'\n"), expirationstring);
-      GNUNET_SCHEDULER_shutdown ();
       ret = 1;
+      finish_command ();
       return;
     }
     memset (&rd, 0, sizeof(rd));
@@ -1556,34 +1737,155 @@ run_with_zone_pkey (const struct GNUNET_CONFIGURATION_Handle *cfg)
   }
 }
 
+#define MAX_LINE_LEN 4086
+
+#define MAX_ARGS 20
+
+static int
+get_identity_for_string (const char *str,
+                         struct GNUNET_IDENTITY_PrivateKey *zk)
+{
+  const struct GNUNET_IDENTITY_PrivateKey *privkey;
+  struct GNUNET_IDENTITY_PublicKey pubkey;
+  struct GNUNET_IDENTITY_PublicKey ego_pubkey;
+  struct EgoEntry *ego_entry;
+
+  if (GNUNET_OK == GNUNET_IDENTITY_public_key_from_string (str,
+                                                           &pubkey))
+  {
+    for (ego_entry = ego_head;
+         NULL != ego_entry; ego_entry = ego_entry->next)
+    {
+      privkey = GNUNET_IDENTITY_ego_get_private_key (ego_entry->ego);
+      GNUNET_IDENTITY_ego_get_public_key (ego_entry->ego, &ego_pubkey);
+      if (0 == memcmp (&ego_pubkey, &pubkey, sizeof (pubkey)))
+      {
+        *zk = *privkey;
+        return GNUNET_OK;
+      }
+    }
+  }
+  else
+  {
+    for (ego_entry = ego_head; NULL != ego_entry; ego_entry = ego_entry->next)
+    {
+      /** FIXME: Check for zTLD? **/
+      if (0 != strcmp (str, ego_entry->identifier))
+        continue;
+      *zk = *GNUNET_IDENTITY_ego_get_private_key (ego_entry->ego);
+      return GNUNET_OK;
+    }
+  }
+  return GNUNET_NO;
+}
 
-/**
- * Callback invoked from identity service with ego information.
- * An @a ego of NULL means the ego was not found.
- *
- * @param cls closure with the configuration
- * @param ego an ego known to identity service, or NULL
- */
 static void
-identity_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego)
+process_command_stdin ()
 {
-  const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
+  char buf[MAX_LINE_LEN];
+  static struct GNUNET_IDENTITY_PrivateKey next_zone_key;
+  static char next_name[GNUNET_DNSPARSER_MAX_NAME_LENGTH];
+  static int finished = GNUNET_NO;
+  static int have_next_zonekey = GNUNET_NO;
+  int zonekey_set = GNUNET_NO;
+  char *tmp;
 
-  el = NULL;
 
-  if (NULL == ego)
+  if (GNUNET_YES == have_next_zonekey)
+  {
+    zone_pkey = next_zone_key;
+    if (NULL != name)
+      GNUNET_free (name);
+    name = GNUNET_strdup (next_name);
+    zonekey_set = GNUNET_YES;
+  }
+  while (NULL != fgets (buf, sizeof (buf), stdin))
   {
-    if (NULL != ego_name)
+    if (1 >= strlen (buf))
+      continue;
+    if (buf[strlen (buf) - 1] == '\n')
+      buf[strlen (buf) - 1] = '\0';
+    /**
+     * Check if this is a new name. If yes, and we have records, store them.
+     */
+    if (buf[strlen (buf) - 1] == ':')
     {
-      fprintf (stderr,
-               _ ("Ego `%s' not known to identity service\n"),
-               ego_name);
+      memset (next_name, 0, sizeof (next_name));
+      strncpy (next_name, buf, strlen (buf) - 1);
+      tmp = strchr (next_name, '.');
+      if (NULL == tmp)
+      {
+        fprintf (stderr, "Error parsing name `%s'\n", next_name);
+        ns_qe = GNUNET_NAMESTORE_transaction_commit (ns, &commit_cb, NULL);
+        ret = 1;
+        return;
+      }
+      if (GNUNET_OK != get_identity_for_string (tmp + 1, &next_zone_key))
+      {
+        fprintf (stderr, "Error parsing zone name `%s'\n", tmp + 1);
+        ret = 1;
+        GNUNET_SCHEDULER_shutdown ();
+        return;
+      }
+      *tmp = '\0';
+      printf ("Switching to new name `%s' in zone `%s'\n", next_name, tmp + 1);
+      have_next_zonekey = GNUNET_YES;
+      /* Run a command for the previous record set */
+      if (NULL != recordset)
+      {
+        run_with_zone_pkey (cfg);
+        return;
+      }
+      zone_pkey = next_zone_key;
+      if (NULL != name)
+        GNUNET_free (name);
+      name = GNUNET_strdup (next_name);
+      zonekey_set = GNUNET_YES;
+      continue;
     }
+    if (GNUNET_NO == zonekey_set)
+    {
+      fprintf (stderr, "Warning, encountered recordline without zone\n");
+      continue;
+    }
+    printf ("Parsing `%s'\n", buf);
+    parse_recordline (buf);
+  }
+  if (GNUNET_NO == finished)
+  {
+    if (GNUNET_NO == zonekey_set)
+    {
+      fprintf (stderr, "Warning, encountered recordline without zone\n");
+    }
+    else if (NULL != recordset)
+    {
+      run_with_zone_pkey (cfg); /** one last time **/
+      finished = GNUNET_YES;
+      return;
+    }
+  }
+  ns_qe = GNUNET_NAMESTORE_transaction_commit (ns, &commit_cb, NULL);
+  return;
+}
+
+
+static void
+begin_cb (void *cls, enum GNUNET_ErrorCode ec)
+{
+  ns_qe = NULL;
+  if (GNUNET_EC_NONE != ec)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Failed to start transaction: %s\n",
+                GNUNET_ErrorCode_get_hint (ec));
     GNUNET_SCHEDULER_shutdown ();
-    ret = -1;
     return;
   }
-  zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (ego);
+  if (read_from_stdin)
+  {
+    process_command_stdin ();
+    return;
+  }
   run_with_zone_pkey (cfg);
 }
 
@@ -1606,7 +1908,6 @@ id_connect_cb (void *cls,
                void **ctx,
                const char *name)
 {
-  const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
   struct GNUNET_IDENTITY_PublicKey pk;
   struct EgoEntry *ego_entry;
 
@@ -1621,17 +1922,20 @@ id_connect_cb (void *cls,
     GNUNET_CONTAINER_DLL_insert_tail (ego_head,
                                       ego_tail,
                                       ego_entry);
+    if ((NULL != ego_name) &&
+        (0 == strcmp (name, ego_name)))
+      zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (ego);
     return;
   }
   if (NULL != ego)
     return;
-  if (NULL == ego_name)
-    run_with_zone_pkey (cfg);
-  else
-    el = GNUNET_IDENTITY_ego_lookup (cfg, ego_name, &identity_cb, (void *) cfg);
+  ns_qe = GNUNET_NAMESTORE_transaction_begin (ns, &begin_cb, (void *) cfg);
 }
 
 
+
+
+
 /**
  * Main function that will be run.
  *
@@ -1644,202 +1948,36 @@ static void
 run (void *cls,
      char *const *args,
      const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
+     const struct GNUNET_CONFIGURATION_Handle *_cfg)
 {
-  const char *pkey_str;
-
   (void) cls;
   (void) args;
   (void) cfgfile;
+  cfg = _cfg;
   if (NULL != args[0])
     GNUNET_log (
       GNUNET_ERROR_TYPE_WARNING,
       _ ("Superfluous command line arguments (starting with `%s') ignored\n"),
       args[0]);
-  if ((NULL != args[0]) && (NULL == uri))
-    uri = GNUNET_strdup (args[0]);
 
   GNUNET_SCHEDULER_add_shutdown (&do_shutdown, (void *) cfg);
-  pkey_str = getenv ("GNUNET_NAMESTORE_EGO_PRIVATE_KEY");
-  if (NULL != pkey_str)
+  ns = GNUNET_NAMESTORE_connect (cfg);
+  if (NULL == ns)
   {
-    if (GNUNET_OK != GNUNET_STRINGS_string_to_data (pkey_str,
-                                                    strlen (pkey_str),
-                                                    &zone_pkey,
-                                                    sizeof(zone_pkey)))
-    {
-      fprintf (stderr,
-               "Malformed private key `%s' in $%s\n",
-               pkey_str,
-               "GNUNET_NAMESTORE_EGO_PRIVATE_KEY");
-      ret = 1;
-      GNUNET_SCHEDULER_shutdown ();
-      return;
-    }
-    run_with_zone_pkey (cfg);
+    fprintf (stderr, _ ("Failed to connect to namestore\n"));
+    GNUNET_SCHEDULER_shutdown ();
     return;
   }
   idh = GNUNET_IDENTITY_connect (cfg, &id_connect_cb, (void *) cfg);
   if (NULL == idh)
-    fprintf (stderr, _ ("Cannot connect to identity service\n"));
-  ret = -1;
-}
-
-
-/**
- * Command-line option parser function that allows the user to specify
- * a complete record as one argument for adding/removing.  A pointer
- * to the head of the list of record sets must be passed as the "scls"
- * argument.
- *
- * @param ctx command line processor context
- * @param scls must be of type "struct GNUNET_FS_Uri **"
- * @param option name of the option (typically 'R')
- * @param value command line argument given; format is
- *        "TTL TYPE FLAGS VALUE" where TTL is an expiration time (rel or abs),
- *        always given in seconds (without the unit),
- *         TYPE is a DNS/GNS record type, FLAGS is either "n" for no flags or
- *         a combination of 's' (shadow) and 'p' (public) and VALUE is the
- *         value (in human-readable format)
- * @return #GNUNET_OK on success
- */
-static int
-multirecord_process (struct GNUNET_GETOPT_CommandLineProcessorContext *ctx,
-                     void *scls,
-                     const char *option,
-                     const char *value)
-{
-  struct RecordSetEntry **head = scls;
-  struct RecordSetEntry *r;
-  struct GNUNET_GNSRECORD_Data record;
-  char *cp;
-  char *tok;
-  char *saveptr;
-  int etime_is_rel;
-  void *raw_data;
-
-  (void) ctx;
-  (void) option;
-  cp = GNUNET_strdup (value);
-  tok = strtok_r (cp, " ", &saveptr);
-  if (NULL == tok)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _ ("Empty record line argument is not allowed.\n"));
-    GNUNET_free (cp);
-    return GNUNET_SYSERR;
-  }
-  {
-    char *etime_in_s;
-
-    GNUNET_asprintf (&etime_in_s, "%s s", tok);
-    if (GNUNET_OK !=
-        parse_expiration (etime_in_s, &etime_is_rel, &record.expiration_time))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _ ("Invalid expiration time `%s' (must be without unit)\n"),
-                  tok);
-      GNUNET_free (cp);
-      GNUNET_free (etime_in_s);
-      return GNUNET_SYSERR;
-    }
-    GNUNET_free (etime_in_s);
-  }
-  tok = strtok_r (NULL, " ", &saveptr);
-  if (NULL == tok)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _ ("Missing entries in record line `%s'.\n"),
-                value);
-    GNUNET_free (cp);
-    return GNUNET_SYSERR;
-  }
-  record.record_type = GNUNET_GNSRECORD_typename_to_number (tok);
-  if (UINT32_MAX == record.record_type)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _ ("Unknown record type `%s'\n"), tok);
-    GNUNET_free (cp);
-    return GNUNET_SYSERR;
-  }
-  tok = strtok_r (NULL, " ", &saveptr);
-  if (NULL == tok)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _ ("Missing entries in record line `%s'.\n"),
-                value);
-    GNUNET_free (cp);
-    return GNUNET_SYSERR;
-  }
-  record.flags = GNUNET_GNSRECORD_RF_NONE;
-  if (etime_is_rel)
-    record.flags |= GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION;
-  if (NULL == strchr (tok, (unsigned char) 'p')) /* p = public */
-    record.flags |= GNUNET_GNSRECORD_RF_PRIVATE;
-  if (NULL != strchr (tok, (unsigned char) 's'))
-    record.flags |= GNUNET_GNSRECORD_RF_SHADOW;
-  /* find beginning of record value */
-  tok = strchr (&value[tok - cp], (unsigned char) ' ');
-  if (NULL == tok)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _ ("Missing entries in record line `%s'.\n"),
-                value);
-    GNUNET_free (cp);
-    return GNUNET_SYSERR;
-  }
-  GNUNET_free (cp);
-  tok++; /* skip space */
-  if (GNUNET_OK != GNUNET_GNSRECORD_string_to_value (record.record_type,
-                                                     tok,
-                                                     &raw_data,
-                                                     &record.data_size))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _ ("Invalid record data for type %s: `%s'.\n"),
-                GNUNET_GNSRECORD_number_to_typename (record.record_type),
-                tok);
-    return GNUNET_SYSERR;
+    ret = -1;
+    fprintf (stderr, _ ("Cannot connect to identity service\n"));
+    GNUNET_SCHEDULER_shutdown ();
   }
-
-  r = GNUNET_malloc (sizeof(struct RecordSetEntry) + record.data_size);
-  r->next = *head;
-  record.data = &r[1];
-  memcpy (&r[1], raw_data, record.data_size);
-  GNUNET_free (raw_data);
-  r->record = record;
-  *head = r;
-  return GNUNET_OK;
 }
 
 
-/**
- * Allow user to specify keywords.
- *
- * @param shortName short name of the option
- * @param name long name of the option
- * @param argumentHelp help text for the option argument
- * @param description long help text for the option
- * @param[out] topKeywords set to the desired value
- */
-struct GNUNET_GETOPT_CommandLineOption
-multirecord_option (char shortName,
-                    const char *name,
-                    const char *argumentHelp,
-                    const char *description,
-                    struct RecordSetEntry **rs)
-{
-  struct GNUNET_GETOPT_CommandLineOption clo = { .shortName = shortName,
-                                                 .name = name,
-                                                 .argumentHelp = argumentHelp,
-                                                 .description = description,
-                                                 .require_argument = 1,
-                                                 .processor =
-                                                   &multirecord_process,
-                                                 .scls = (void *) rs };
-
-  return clo;
-}
-
 
 /**
  * The main function for gnunet-namestore.
@@ -1851,6 +1989,7 @@ multirecord_option (char shortName,
 int
 main (int argc, char *const *argv)
 {
+  int lret;
   struct GNUNET_GETOPT_CommandLineOption options[] =
   { GNUNET_GETOPT_option_flag ('a', "add", gettext_noop ("add record"), &add),
     GNUNET_GETOPT_option_flag ('d',
@@ -1861,6 +2000,10 @@ main (int argc, char *const *argv)
                                "display",
                                gettext_noop ("display records"),
                                &list),
+    GNUNET_GETOPT_option_flag ('S',
+                               "from-stdin",
+                               gettext_noop ("read commands from stdin"),
+                               &read_from_stdin),
     GNUNET_GETOPT_option_string (
       'e',
       "expiration",
@@ -1885,19 +2028,16 @@ main (int argc, char *const *argv)
                                  gettext_noop (
                                    "name of the record to add/delete/display"),
                                  &name),
-    GNUNET_GETOPT_option_string ('r',
-                                 "reverse",
-                                 "PKEY",
+    GNUNET_GETOPT_option_flag ('r',
+                               "recordline",
+                               gettext_noop ("Output in recordline format"),
+                               &output_recordline),
+    GNUNET_GETOPT_option_string ('Z',
+                                 "zone-to-name",
+                                 "KEY",
                                  gettext_noop (
-                                   "determine our name for the given PKEY"),
+                                   "determine our name for the given KEY"),
                                  &reverse_pkey),
-    multirecord_option (
-      'R',
-      "replace",
-      "RECORDLINE",
-      gettext_noop (
-        "set record set to values given by (possibly multiple) RECORDLINES; can be specified multiple times"),
-      &recordset),
     GNUNET_GETOPT_option_string ('t',
                                  "type",
                                  "TYPE",
@@ -1956,7 +2096,7 @@ main (int argc, char *const *argv)
                                    "name of the ego controlling the zone"),
                                  &ego_name),
     GNUNET_GETOPT_OPTION_END };
-  int lret;
+
 
   if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
     return 2;
diff --git a/src/namestore/test_namestore_put_multiple.sh b/src/namestore/test_namestore_put_multiple.sh
index f33fb1c3a..4c7340440 100644..100755
--- a/src/namestore/test_namestore_put_multiple.sh
+++ b/src/namestore/test_namestore_put_multiple.sh
@@ -24,25 +24,9 @@ if [ 0 -ne $ret ]; then
     gnunet-identity -C randomtestingid
 fi
 
-function minimize_ttl {
-    ttl=10000000
-    arr=$1
-    # parse each element and update ttl to smallest one
-    for i in "${arr[@]}"
-    do
-        currttl=$(echo -n "$i" | cut -d' ' -f1)
-        if [ "$currttl"  -lt "$ttl" ]
-        then
-            ttl=$currttl
-        fi
-
-    done
-    echo "$ttl"
-}
-
 function get_record_type {
     arr=$1
-    typ=$(echo -n "${arr[0]}" | cut -d' ' -f2)
+    typ=$(echo -n "${arr[0]}" | cut -d' ' -f1)
     echo "$typ"
 }
 
@@ -59,10 +43,14 @@ function testing {
     typ=$(get_record_type "${records[@]}")
     for i in "${records[@]}"
     do
-        recordstring+="-R $i"
+        recordstring+="$i"$'\n'
     done
-    #echo "$recordstring"
-    gnunet-namestore -z randomtestingid -n "$label" "$recordstring" 2>&1  /dev/null
+    echo "$recordstring"
+    gnunet-namestore -a -S <<EOF
+$label.randomtestingid:
+      $recordstring
+EOF
+    ret=$?
     if [ 0 -ne $ret ]; then
         echo "failed to add record $label: $recordstring"
     fi
@@ -75,26 +63,27 @@ function testing {
 # TEST CASES
 # 1
 echo "Testing adding of single A record with -R"
+declare -a arr=('A 1200 [r] 127.0.0.1')
 testing test1 "${arr[@]}"
 # 2
 echo "Testing adding of multiple A records with -R"
-declare -a arr=('1200 A n 127.0.0.1' '2400 A n 127.0.0.2')
+declare -a arr=('A 1200 [r] 127.0.0.1' 'A 2400 [r] 127.0.0.2')
 testing test2 "${arr[@]}"
 # 3
 echo "Testing adding of multiple different records with -R"
-declare -a arr=('1200 A n 127.0.0.1' '2400 AAAA n 2002::')
+declare -a arr=('A 1200 [r] 127.0.0.1' 'AAAA 2400 [r] 2002::')
 testing test3 "${arr[@]}"
 # 4
 echo "Testing adding of single GNS2DNS record with -R"
-declare -a arr=('86400 GNS2DNS n gnu.org@127.0.0.1')
+declare -a arr=('GNS2DNS 86400 [r] gnu.org@127.0.0.1')
 testing test4 "${arr[@]}"
 # 5
 echo "Testing adding of single GNS2DNS shadow record with -R"
-declare -a arr=('86409 GNS2DNS s gnu.org@127.0.0.250')
+declare -a arr=('GNS2DNS 86409 [rs] gnu.org@127.0.0.250')
 testing test5 "${arr[@]}"
 # 6
 echo "Testing adding of multiple GNS2DNS record with -R"
-declare -a arr=('1 GNS2DNS n gnunet.org@127.0.0.1' '3600 GNS2DNS s gnunet.org@127.0.0.2')
+declare -a arr=('GNS2DNS 1 [r] gnunet.org@127.0.0.1' 'GNS2DNS 3600 [s] gnunet.org@127.0.0.2')
 testing test6 "${arr[@]}"
 val=$(gnunet-gns -t GNS2DNS -u test6.randomtestingid)
 if [[ $val == *"127.0.0.1"* ]]; then
@@ -108,16 +97,16 @@ if [[ $val == *"127.0.0.2"* ]]; then
 fi
 # 7
 echo "Testing adding MX record with -R"
-declare -a arr=('3600 MX n 10,mail')
+declare -a arr=('MX 3600 [r] 10,mail')
 testing test7 "${arr[@]}"
 # 8
 echo "Testing adding TXT record with -R"
-declare -a arr=('3600 TXT n Pretty_Unicorns')
+declare -a arr=('TXT 3600 [r] Pretty_Unicorns')
 testing test8 "${arr[@]}"
 # 8
-echo "Testing adding TXT record with -R"
-declare -a arr=('3600 SRV n _autodiscover_old._tcp.bfh.ch.')
-testing test8 "${arr[@]}"
+#echo "Testing adding TXT record with -R"
+#declare -a arr=('SRV 3600 [r] _autodiscover_old._tcp.bfh.ch.')
+#testing test8 "${arr[@]}"
 
 # CLEANUP
 gnunet-identity -D randomtestingid
diff --git a/src/namestore/test_namestore_put_stdin.sh b/src/namestore/test_namestore_put_stdin.sh
new file mode 100755
index 000000000..deb7bc4cb
--- /dev/null
+++ b/src/namestore/test_namestore_put_stdin.sh
@@ -0,0 +1,68 @@
+#!/bin/bash
+CONFIGURATION="test_namestore_api.conf"
+trap "gnunet-arm -e -c $CONFIGURATION" SIGINT
+
+LOCATION=$(which gnunet-config)
+if [ -z $LOCATION ]
+then
+  LOCATION="gnunet-config"
+fi
+$LOCATION --version 1> /dev/null
+if test $? != 0
+then
+        echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX"
+        exit 77
+fi
+
+rm -rf `$LOCATION -c $CONFIGURATION -s PATHS -o GNUNET_HOME`
+TEST_RECORD_NAME="www3"
+TEST_RECORD_NAME2="www"
+TEST_IP="8.7.6.5"
+TEST_IP2="1.2.3.4"
+
+which timeout &> /dev/null && DO_TIMEOUT="timeout 5"
+
+function start_peer
+{
+        gnunet-arm -s -c $CONFIGURATION
+        gnunet-identity -C testego -c $CONFIGURATION
+  gnunet-identity -C testego2 -c $CONFIGURATION
+}
+
+function stop_peer
+{
+        gnunet-identity -D testego -c $CONFIGURATION
+  gnunet-identity -D testego2 -c $CONFIGURATION
+        gnunet-arm -e -c $CONFIGURATION
+}
+
+
+start_peer
+# Create a public record
+EGOKEY=`gnunet-identity -d | grep testego2 | cut -d' ' -f3`
+gnunet-namestore -a -c $CONFIGURATION -S <<EOF
+$TEST_RECORD_NAME.testego:
+  A 3600000000 [pr] $TEST_IP
+  TXT 21438201833 [r] $TEST_IP2
+
+  TXT 21438201833 [r] aslkdj asdlkjaslkd 232!
+
+$TEST_RECORD_NAME2.testego:
+  AAAA 324241223 [prS] ::dead:beef
+  A 111324241223000000 [pC] 1.1.1.1
+
+www7.$EGOKEY:
+  A 3600000000 [pr] $TEST_IP
+
+EOF
+NAMESTORE_RES=$?
+gnunet-namestore -D -r -c $CONFIGURATION
+stop_peer
+
+if [ $NAMESTORE_RES = 0 ]
+then
+  echo "PASS: Creating name in namestore"
+else
+  echo "FAIL: Creating name in namestore failed with $NAMESTORE_RES."
+  exit 1
+fi