[GNUnet-SVN] r15082 - gnunet/src/fs

[gnunet]

Author: grothoff
Date: 2011-04-27 20:36:33 +0200 (Wed, 27 Apr 2011)
New Revision: 15082

Modified:
   gnunet/src/fs/gnunet-pseudonym.c
   gnunet/src/fs/gnunet-publish.c
Log:
use correct expiration values

Modified: gnunet/src/fs/gnunet-pseudonym.c
===================================================================
--- gnunet/src/fs/gnunet-pseudonym.c    2011-04-27 18:34:56 UTC (rev 15081)
+++ gnunet/src/fs/gnunet-pseudonym.c    2011-04-27 18:36:33 UTC (rev 15082)
@@ -53,7 +53,7 @@
 /**
  * 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 @@
      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,

Modified: gnunet/src/fs/gnunet-publish.c
===================================================================
--- gnunet/src/fs/gnunet-publish.c      2011-04-27 18:34:56 UTC (rev 15081)
+++ gnunet/src/fs/gnunet-publish.c      2011-04-27 18:36:33 UTC (rev 15082)
@@ -44,7 +44,7 @@
 
 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 @@
      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,