[gnunet] branch master updated (aedaeb128 -> 8a3e6b3f7)

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a change to branch master
in repository gnunet.

    from aedaeb128 Merge branch 'master' of git+ssh://git.gnunet.org/gnunet
     new 5af36f7f2 - remove some flags which do not make sense in the bulk 
stdin functionality
     new 8a3e6b3f7 - add test; update manpage

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 doc/man/gnunet-namestore.1       | 32 +++++++++++++++++++++++++++++++-
 src/namestore/Makefile.am        |  1 +
 src/namestore/gnunet-namestore.c | 33 ---------------------------------
 3 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/doc/man/gnunet-namestore.1 b/doc/man/gnunet-namestore.1
index 9391e21bb..c70e4499d 100644
--- a/doc/man/gnunet-namestore.1
+++ b/doc/man/gnunet-namestore.1
@@ -46,6 +46,7 @@
 .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
@@ -119,6 +120,12 @@ The VALUE follows the usual human-readable value format(s) 
of DNS/GNS.
 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
+This reads commands from stdin until EOF is encountered.
+The commands are formatted like the arguments used for gnunet-namestore.
+Arguments that
+.B cannot
+be used for commands in this mode are: -l, -L, -D, -S, -m, -h, -c, -v, -r, -o, 
-T, -O
 .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
@@ -145,7 +152,30 @@ 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.
 .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
+--from-stdin <<EOF
+  -z alice -a -n www -t A -V "1.2.3.4" -e 3600s -p
+  -z bob -a -n www -t A -V "4.3.2.1" -e 24h -p
+ EOF
+.Tp
+.Pp
+.Dl Read record multiple import commands 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 46012cf21..cc887c845 100644
--- a/src/namestore/gnunet-namestore.c
+++ b/src/namestore/gnunet-namestore.c
@@ -1763,14 +1763,6 @@ process_command_stdin ()
                                "delete",
                                gettext_noop ("delete record"),
                                &del),
-    GNUNET_GETOPT_option_flag ('D',
-                               "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",
@@ -1784,23 +1776,12 @@ process_command_stdin ()
                                  gettext_noop (
                                    "set the desired nick name for the zone"),
                                  &nickstring),
-    GNUNET_GETOPT_option_flag ('m',
-                               "monitor",
-                               gettext_noop (
-                                 "monitor changes in the namestore"),
-                               &monitor),
     GNUNET_GETOPT_option_string ('n',
                                  "name",
                                  "NAME",
                                  gettext_noop (
                                    "name of the record to add/delete/display"),
                                  &name),
-    GNUNET_GETOPT_option_string ('r',
-                                 "reverse",
-                                 "PKEY",
-                                 gettext_noop (
-                                   "determine our name for the given PKEY"),
-                                 &reverse_pkey),
     multirecord_option (
       'R',
       "replace",
@@ -1829,25 +1810,11 @@ process_command_stdin ()
                                "public",
                                gettext_noop ("create or list public record"),
                                &is_public),
-    GNUNET_GETOPT_option_flag ('o',
-                               "omit-private",
-                               gettext_noop ("omit private records"),
-                               &omit_private),
-    GNUNET_GETOPT_option_flag ('T',
-                               "include-maintenance",
-                               gettext_noop (
-                                 "do not filter maintenance records"),
-                               &include_maintenance),
     GNUNET_GETOPT_option_flag ('P',
                                "purge-orphans",
                                gettext_noop (
                                  "purge namestore of all orphans"),
                                &purge_orphaned),
-    GNUNET_GETOPT_option_flag ('O',
-                               "list-orphans",
-                               gettext_noop (
-                                 "show private key for orphaned records for 
recovery using `gnunet-identity -C -P <key>'. Use in combination with 
--display"),
-                               &list_orphaned),
     GNUNET_GETOPT_option_flag ('X',
                                "purge-zone-records",
                                gettext_noop (

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.