use correct expiration values

diff --git a/src/fs/gnunet-pseudonym.c b/src/fs/gnunet-pseudonym.c
index 68a760867fc4eae7f543da4155c7856914d189dc..d7a13e4860a71af84431292cfdb4ef18995063e7 100644 (file)
--- a/src/fs/gnunet-pseudonym.c
+++ b/src/fs/gnunet-pseudonym.c
@@ -53,7 +53,7 @@ static struct GNUNET_CONTAINER_MetaData *adv_metadata;
 /**
  * Our block options (-p, -r, -a).
  */
-static struct GNUNET_FS_BlockOptions bo = { { 2 * 365 * 24 * 60 * 60 * 1000LL  }, 1, 365, 1 };
+static struct GNUNET_FS_BlockOptions bo = { { 0LL  }, 1, 365, 1 };
 
 /**
  * -q option given.
@@ -352,6 +352,7 @@ main (int argc, char *const *argv)
      1, &GNUNET_GETOPT_set_string, &rating_change},
     GNUNET_GETOPT_OPTION_END
   };
+  bo.expiration_time = GNUNET_FS_year_to_time (GNUNET_FS_get_current_year () + 2);
   return (GNUNET_OK ==
           GNUNET_PROGRAM_run (argc,
                               argv,

diff --git a/src/fs/gnunet-publish.c b/src/fs/gnunet-publish.c
index 1fbdb9e07a1856156d5b67103c91f396442ba424..57ddde32a3a23d0f093a585c8744805eaf8e889f 100644 (file)
--- a/src/fs/gnunet-publish.c
+++ b/src/fs/gnunet-publish.c
@@ -44,7 +44,7 @@ static struct GNUNET_FS_Uri *topKeywords;
 
 static struct GNUNET_FS_Uri *uri;
 
-static struct GNUNET_FS_BlockOptions bo = { { 2 * 365 * 24 * 60 * 60 * 1000LL  }, 1, 365, 1 };
+static struct GNUNET_FS_BlockOptions bo = { { 0LL  }, 1, 365, 1 };
 
 static char *uri_string;
 
@@ -685,6 +685,7 @@ main (int argc, char *const *argv)
      0, &GNUNET_GETOPT_set_one, &verbose},
     GNUNET_GETOPT_OPTION_END
   };
+  bo.expiration_time = GNUNET_FS_year_to_time (GNUNET_FS_get_current_year () + 2);
   return (GNUNET_OK ==
           GNUNET_PROGRAM_run (argc,
                               argv,