-fix

[oweals/gnunet.git] / src / namestore / gnunet-namestore.c

diff --git a/src/namestore/gnunet-namestore.c b/src/namestore/gnunet-namestore.c
index c2f5941e3b112741dd3526738cda5c57549d7cea..fccf92ce7d9936b8deb345ed746fc1268bbfeb81 100644 (file)
--- a/src/namestore/gnunet-namestore.c
+++ b/src/namestore/gnunet-namestore.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2012, 2013, 2014 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2012, 2013, 2014 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 /**
  * @file gnunet-namestore.c
@@ -109,11 +109,6 @@ static int is_public;
  */
 static int is_shadow;
 
-/**
- * Is record pending approval (#GNUNET_GNSRECORD_RF_PENDING)
- */
-static int is_pending;
-
 /**
  * Queue entry for the 'del' operation.
  */
@@ -414,7 +409,7 @@ display_record (void *cls,
       ets = GNUNET_STRINGS_absolute_time_to_string (at);
     }
     FPRINTF (stdout,
-            "\t%s: %s (%s)\t%s\t%s\t%s\n",
+            "\t%s: %s (%s)\t%s\t%s\n",
             typestring,
             s,
              ets,
@@ -492,6 +487,7 @@ get_existing_record (void *cls,
                rec_name);
       ret = 1;
       test_finished ();
+      return;
     case GNUNET_GNSRECORD_TYPE_GNS2DNS:
       fprintf (stderr,
                _("A %s record exists already under `%s', no other records can be added.\n"),
@@ -1063,7 +1059,6 @@ int
 main (int argc, char *const *argv)
 {
   is_public = -1;
-  is_pending = -1;
   is_shadow = -1;
 
   static const struct GNUNET_GETOPT_CommandLineOption options[] = {
@@ -1103,9 +1098,6 @@ main (int argc, char *const *argv)
     {'p', "public", NULL,
      gettext_noop ("create or list public record"), 0,
      &GNUNET_GETOPT_set_one, &is_public},
-    {'P', "pending", NULL,
-     gettext_noop ("create record that is pending approval (and thus for now inactive)"), 0,
-     &GNUNET_GETOPT_set_one, &is_pending},
     {'s', "shadow", NULL,
      gettext_noop ("create shadow record (only valid if all other records of the same type have expired"), 0,
      &GNUNET_GETOPT_set_one, &is_shadow},