make no creation time the default

3 files changed, 15 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index c5473865e..0bf4dffdf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
+Sat Mar  9 01:58:22 CET 2019
+        gnunet-publish now by default does not expose the creation time,
+        option -d no longer exists, to enable the old behavior use -E. -CG
+
 Sat Mar 2 14:23:10 2019 +0100
-  utils: gnunet-qr.py now installed under pkgshare instead of bin
+        utils: gnunet-qr.py now installed under pkgshare instead of bin
 
 Thu Feb 28 19:07:59 CET 2019
   CADET: Fix in order, unrealiable message ordering
diff --git a/doc/man/gnunet-publish.1 b/doc/man/gnunet-publish.1
index b07208732..5f774580b 100644
--- a/doc/man/gnunet-publish.1
+++ b/doc/man/gnunet-publish.1
@@ -112,9 +112,9 @@ default is ~/.config/gnunet.conf).
 Disable use of GNU libextractor for finding additional keywords and
 metadata.
 .TP
-\fB\-d\fR, \fB\-\-disable\-creation\-time\fR
-Disable use of creation time timestamp in metadata.
-Useful to make created directories deterministic and to avoid leaking
+\fB\-E\fR, \fB\-\-enable\-creation\-time\fR
+Enable use of creation time timestamp in metadata.
+Setting this information will leak
 information about the time at which a file was made available.
 .TP
 \fB\-e\fR, \fB\-\-extract\fR
diff --git a/src/fs/gnunet-publish.c b/src/fs/gnunet-publish.c
index eb8a7ed19..fbf32c2a7 100644
--- a/src/fs/gnunet-publish.c
+++ b/src/fs/gnunet-publish.c
@@ -122,7 +122,7 @@ static int extract_only;
 /**
  * Command-line option to disable adding creation time.
  */
-static int do_disable_creation_time;
+static int enable_creation_time;
 
 /**
  * Handle to the directory scanner (for recursive insertions).
@@ -419,7 +419,7 @@ publish_inspector (void *cls,
     GNUNET_CONTAINER_meta_data_destroy (meta);
     meta = NULL;
   }
-  if (!do_disable_creation_time)
+  if (enable_creation_time)
     GNUNET_CONTAINER_meta_data_add_publication_date (m);
   if (extract_only)
   {
@@ -902,15 +902,15 @@ main (int argc,
                                "LEVEL",
                                gettext_noop ("set the desired LEVEL of sender-anonymity"),
                                &bo.anonymity_level),
-    GNUNET_GETOPT_option_flag ('d',
-                               "disable-creation-time",
-                               gettext_noop ("disable adding the creation time to the "
-                                             "metadata of the uploaded file"),
-                               &do_disable_creation_time),
     GNUNET_GETOPT_option_flag ('D',
                                "disable-extractor",
                                gettext_noop ("do not use libextractor to add keywords or metadata"),
                                &disable_extractor),
+    GNUNET_GETOPT_option_flag ('E',
+                               "enable-creation-time",
+                               gettext_noop ("enable adding the creation time to the "
+                                             "metadata of the uploaded file"),
+                               &enable_creation_time),
     GNUNET_GETOPT_option_flag ('e',
                                "extract",
                                gettext_noop ("print list of extracted keywords that would "