[gnunet] branch master updated (36a92f692 -> 3ce870870)

[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 36a92f692 - fixed stack overflow in tng service
     new 5cb62b557 RECLAIM: Fix bug that multiple attributes with the same name 
are added in CLI
     new 3ce870870 - update add option in reclaim man page as well

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-reclaim.1     | 4 ++--
 src/reclaim/gnunet-reclaim.c | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/doc/man/gnunet-reclaim.1 b/doc/man/gnunet-reclaim.1
index 049bff155..70c63666c 100644
--- a/doc/man/gnunet-reclaim.1
+++ b/doc/man/gnunet-reclaim.1
@@ -62,9 +62,9 @@ Configure logging to write logs to LOGFILE.
 .It Fl e Ar EGO | Fl -ego= Ns Ar EGO
 Specify identity to use. Always required.
 .It Fl a Ar NAME | Fl -add= Ns Ar NAME
-Add an attribute with NAME. Must be used in conjunction with -V
+Add or update an attribute with NAME. Must be used in conjunction with -V
 .It Fl V Ar VALUE | Fl -value= Ns Ar VALUE
-Specify value of attribute to add.
+Specify value of attribute to add or update.
 .It Fl t Ar TYPE | Fl -type= Ns Ar TYPE
 Specify type of attribute to add (Default: STRING)
 .It Fl d Ar ID | Fl -delete= Ns Ar ID
diff --git a/src/reclaim/gnunet-reclaim.c b/src/reclaim/gnunet-reclaim.c
index cefb66b8f..da5f90409 100644
--- a/src/reclaim/gnunet-reclaim.c
+++ b/src/reclaim/gnunet-reclaim.c
@@ -521,7 +521,7 @@ iter_cb (void *cls,
   char *id;
   const char *attr_type;
 
-  if ((NULL != attr_name) && (NULL != claim))
+  if ((NULL != attr_name) && (NULL == claim))
   {
     if (0 == strcasecmp (attr_name, attr->name))
     {
@@ -530,6 +530,7 @@ iter_cb (void *cls,
                                             attr->type,
                                             attr->data,
                                             attr->data_size);
+      claim->id = attr->id;
     }
   }
   else if (issue_attrs)
@@ -830,7 +831,7 @@ main (int argc, char *const argv[])
     GNUNET_GETOPT_option_string ('a',
                                  "add",
                                  "NAME",
-                                 gettext_noop ("Add an attribute NAME"),
+                                 gettext_noop ("Add or update an attribute 
NAME"),
                                  &attr_name),
     GNUNET_GETOPT_option_string ('d',
                                  "delete",

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